diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 21:17:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 21:17:34 +0200 |
| commit | 179527f34ea01a2a9b936acde1cb562780db98a6 (patch) | |
| tree | 3cc418475bd0b330664914aeb7696f7689335998 /libavformat/nutdec.c | |
| parent | a25ee5f9228d495fb9a69512632686cfa26df32f (diff) | |
| parent | a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2 (diff) | |
| download | ffmpeg-179527f34ea01a2a9b936acde1cb562780db98a6.tar.gz | |
Merge commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2'
* commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2':
mpegvideo: Have ff_mpeg_ref_picture use AVCodecContext directly
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nutdec.c')
0 files changed, 0 insertions, 0 deletions