-
Michael Niedermayer authored
* commit '75af13a0': mpegvideo: directly use frames in ff_draw_horiz_band() Conflicts: libavcodec/mpegvideo.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
3ddf9b5b
* commit '75af13a0': mpegvideo: directly use frames in ff_draw_horiz_band() Conflicts: libavcodec/mpegvideo.c Merged-by:Michael Niedermayer <michaelni@gmx.at>