mpeg: Drop unused parameters from ff_draw_horiz_band()
avformat: utils: Refactor duplicated PRINT macro
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>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avformat: utils: Refactor duplicated PRINT macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
mjpegdec: parse JPS extension and save relevant stereo3d information

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/mjpegdec Fix potential memleak of stereo3D at the end in case of decoding failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/mjpegdec: use av_freep() instead of av_free()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>