diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 16:23:48 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 16:23:48 +0400 |
| commit | 329a3286d648414b672a983427e5c7d38589f7f9 (patch) | |
| tree | 36ceddc1dd93c08dbcbffec317db574310eaf46e /libavcodec/mpegvideo.h | |
| parent | 29be9b5301212d29186a05f262a6ce04ddbc168c (diff) | |
| parent | be039278b5ebd8075d90a3508db2aed5adf59e02 (diff) | |
Merge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02'
* commit 'be039278b5ebd8075d90a3508db2aed5adf59e02':
mpegvideo: move ff_draw_horiz_band() to mpegutils.c
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 439890dd27..79ee2b20fd 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -729,9 +729,6 @@ void ff_MPV_common_init_axp(MpegEncContext *s); void ff_MPV_common_init_arm(MpegEncContext *s); void ff_MPV_common_init_ppc(MpegEncContext *s); void ff_clean_intra_table_entries(MpegEncContext *s); -void ff_draw_horiz_band(AVCodecContext *avctx, AVFrame *cur, AVFrame *last, - int y, int h, int picture_structure, int first_field, - int low_delay); void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int h); void ff_mpeg_flush(AVCodecContext *avctx); |