diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 15:54:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 15:54:30 +0200 |
| commit | 8e5a02151227f1fc4639c2047ba0059a2dba243d (patch) | |
| tree | 7f353d6a9839cf56fc97cc4f27dd556ae58310f7 /libavutil/parseutils.c | |
| parent | a23748a80429399bf30abf9ff16d23eb8b85b9c4 (diff) | |
| parent | c9be276f8b040e7d441a77f774afe94b6f137be6 (diff) | |
| download | ffmpeg-8e5a02151227f1fc4639c2047ba0059a2dba243d.tar.gz | |
Merge commit 'c9be276f8b040e7d441a77f774afe94b6f137be6' into release/1.1
* commit 'c9be276f8b040e7d441a77f774afe94b6f137be6':
mpegvideo: set reference/pict_type on generated reference frames
Conflicts:
libavcodec/mpegvideo.c
See: 532b93b51631ee58443bee8aec7c2a2b2a1746be
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions