diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 00:16:08 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 00:16:58 +0100 |
commit | 532b93b51631ee58443bee8aec7c2a2b2a1746be (patch) | |
tree | bade8e58b6a5b5a06ddab001146945a7cf6669f6 /libavcodec/ac3enc.c | |
parent | 5047849584f278d62b2e18281e89da13dddcbf87 (diff) | |
parent | feded990e3ef9af4a0b827d5b6d8fe86f0b94942 (diff) | |
download | ffmpeg-532b93b51631ee58443bee8aec7c2a2b2a1746be.tar.gz |
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>
Diffstat (limited to 'libavcodec/ac3enc.c')
0 files changed, 0 insertions, 0 deletions