Merge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 12:23:48 +0000 (13:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 12:23:48 +0000 (13:23 +0100)
commit329a3286d648414b672a983427e5c7d38589f7f9
tree36ceddc1dd93c08dbcbffec317db574310eaf46e
parent29be9b5301212d29186a05f262a6ce04ddbc168c
parentbe039278b5ebd8075d90a3508db2aed5adf59e02
Merge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02'

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

Conflicts:
libavcodec/Makefile

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