Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Jan 2014 16:05:12 +0000 (17:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Jan 2014 16:05:51 +0000 (17:05 +0100)
commitfbafd64acce4a2a0aa6a5b392524a99f397e96a8
treed75aec398f51fa4721cf5bcc9175a1e6e17676c5
parentcfe282ec80dc03667418c601283134eec25f17cf
parent54b2ce7418c0e1467c9e67274e55e1bd86189e63
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpeg: Drop unused parameters from ff_draw_horiz_band()

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/svq3.c