diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 20:57:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 21:15:32 +0200 |
| commit | a25ee5f9228d495fb9a69512632686cfa26df32f (patch) | |
| tree | 28406eb4e763cdd0f031d0d49e2574ac61b23214 /libavformat/nutdec.c | |
| parent | bc373595f28e20f69505dd0d29f716935c06f958 (diff) | |
| parent | d528045558825f01472e9bee873f60c98d661e53 (diff) | |
| download | ffmpeg-a25ee5f9228d495fb9a69512632686cfa26df32f.tar.gz | |
Merge commit 'd528045558825f01472e9bee873f60c98d661e53'
* commit 'd528045558825f01472e9bee873f60c98d661e53':
mpegvideo: Have ff_mpeg_unref_picture use AVCodecContext directly
Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
The memset is left in place
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nutdec.c')
0 files changed, 0 insertions, 0 deletions