[FFmpeg-cvslog] Merge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 17 13:23:48 2014 +0100| [329a3286d648414b672a983427e5c7d38589f7f9] | committer: Michael Niedermayer

Merge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02'

* commit 'be039278b5ebd8075d90a3508db2aed5adf59e02':
  mpegvideo: move ff_draw_horiz_band() to mpegutils.c

Conflicts:
	libavcodec/Makefile

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

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