diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-29 17:05:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-29 17:05:51 +0100 |
| commit | fbafd64acce4a2a0aa6a5b392524a99f397e96a8 (patch) | |
| tree | d75aec398f51fa4721cf5bcc9175a1e6e17676c5 /libavcodec/mpegvideo.h | |
| parent | cfe282ec80dc03667418c601283134eec25f17cf (diff) | |
| parent | 54b2ce7418c0e1467c9e67274e55e1bd86189e63 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpeg: Drop unused parameters from ff_draw_horiz_band()
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 7ecb97eae4..47a58f74b4 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -807,10 +807,9 @@ 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, DSPContext *dsp, Picture *cur, - Picture *last, int y, int h, int picture_structure, - int first_field, int low_delay, - int v_edge_pos, int h_edge_pos); +void ff_draw_horiz_band(AVCodecContext *avctx, Picture *cur, Picture *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); |