diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 02:54:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 02:54:45 +0100 |
| commit | e3b7f0e184a0f21ef7e5c78e180fef258f9c73aa (patch) | |
| tree | 61dd6d35f1900c1e59a5bf31680132df1271dd6a /tests/ref/vsynth/vsynth2-mpeg4-adv | |
| parent | b6e7834ac607f51c06feaa41614661bbde3d2d8b (diff) | |
| parent | d0d111d0592bfd6b2b8bcd2321986c0fc493455d (diff) | |
| download | ffmpeg-e3b7f0e184a0f21ef7e5c78e180fef258f9c73aa.tar.gz | |
Merge commit 'd0d111d0592bfd6b2b8bcd2321986c0fc493455d'
* commit 'd0d111d0592bfd6b2b8bcd2321986c0fc493455d':
mpegvideo: remove commented out cruft from ff_MPV_frame_end()
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/vsynth/vsynth2-mpeg4-adv')
0 files changed, 0 insertions, 0 deletions