Michael Niedermayer
|
329a3286d6
|
Merge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02'
* commit 'be039278b5ebd8075d90a3508db2aed5adf59e02':
mpegvideo: move ff_draw_horiz_band() to mpegutils.c
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-03-17 13:23:48 +01:00 |
|
Michael Niedermayer
|
9517900bef
|
Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'
* commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b':
mpegvideo: move mpegvideo formats-related defines to mpegutils.h
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_mvpred.h
libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-03-17 12:36:48 +01:00 |
|
Vittorio Giovara
|
be039278b5
|
mpegvideo: move ff_draw_horiz_band() to mpegutils.c
Drop the mpegvideo dependency for svq3 in configure.
|
2014-03-16 23:05:39 +01:00 |
|
Vittorio Giovara
|
e0c16e4e32
|
mpegvideo: move mpegvideo formats-related defines to mpegutils.h
|
2014-03-16 23:04:41 +01:00 |