[FFmpeg-cvslog] Merge commit '75af13a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 17 04:34:21 2014 +0100| [3ddf9b5b7750bda97a591272fa0860e53b4f5c4f] | committer: Michael Niedermayer

Merge commit '75af13a'

* commit '75af13a':
  mpegvideo: directly use frames in ff_draw_horiz_band()

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ddf9b5b7750bda97a591272fa0860e53b4f5c4f
---