diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 21:25:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 22:39:47 +0200 |
| commit | f275f9eaee9c69bcbc732002f0ee36f480eebb85 (patch) | |
| tree | 8262a8aee25ee9ff50bc036381c542f474bb0ba3 /libavformat/nutdec.c | |
| parent | 179527f34ea01a2a9b936acde1cb562780db98a6 (diff) | |
| parent | 4e17946f10d39eec6cc03fb249ae8147373141b6 (diff) | |
| download | ffmpeg-f275f9eaee9c69bcbc732002f0ee36f480eebb85.tar.gz | |
Merge commit '4e17946f10d39eec6cc03fb249ae8147373141b6'
* commit '4e17946f10d39eec6cc03fb249ae8147373141b6':
mpegvideo: Rework various functions not to use MpegEncContext 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