OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5047849 feded99)
Merge commit 'feded990e3ef9af4a0b827d5b6d8fe86f0b94942'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jan 2014 23:16:08 +0000 (00:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jan 2014 23:16:58 +0000 (00:16 +0100)
commit532b93b51631ee58443bee8aec7c2a2b2a1746be
treebade8e58b6a5b5a06ddab001146945a7cf6669f6tree | snapshot
parent5047849584f278d62b2e18281e89da13dddcbf87commit | diff
parentfeded990e3ef9af4a0b827d5b6d8fe86f0b94942commit | diff
Merge commit 'feded990e3ef9af4a0b827d5b6d8fe86f0b94942'

* commit 'feded990e3ef9af4a0b827d5b6d8fe86f0b94942':
  mpegvideo: set reference/pict_type on generated reference frames

Conflicts:
libavcodec/mpegvideo.c

The picture type is left at P type as it was explicitly set before

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.c diff1 | diff2 | blob | history
external/ffmpeg
About OSDN
Find Software
Develop Software
Help