Merge commit 'd0d111d0'
* commit 'd0d111d0': mpegvideo: remove commented out cruft from ff_MPV_frame_end() Conflicts: libavcodec/mpegvideo.c Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment