-
Michael Niedermayer authored
* commit 'd0d111d0': mpegvideo: remove commented out cruft from ff_MPV_frame_end() Conflicts: libavcodec/mpegvideo.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
e3b7f0e1
* commit 'd0d111d0': mpegvideo: remove commented out cruft from ff_MPV_frame_end() Conflicts: libavcodec/mpegvideo.c Merged-by:Michael Niedermayer <michaelni@gmx.at>