* qatar/master: mpeg: Drop unused parameters from ff_draw_horiz_band() Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>