diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 03:54:35 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 03:55:39 +0100 |
commit | 1897c4a119d26a4f4781383497c2ab646cf60fe7 (patch) | |
tree | 757b9d985e397f160954b8f280f9ff21a77be205 /libavfilter/video.c | |
parent | 47e5eaf8c9869e8e34e96252b8eeaabec7bcc894 (diff) | |
parent | 3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab (diff) | |
download | ffmpeg-1897c4a119d26a4f4781383497c2ab646cf60fe7.tar.gz |
Merge commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab'
* commit '3b1c0f686d5a162ceb5048910a7ce0bf7ed3a1ab':
mpeg4videodec: move new_pred from MpegEncContext to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/video.c')
0 files changed, 0 insertions, 0 deletions