diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 07:34:21 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 07:35:48 +0400 |
| commit | 3ddf9b5b7750bda97a591272fa0860e53b4f5c4f (patch) | |
| tree | c9175f613329f9612cd956efa3a99dad57f2163d /libavcodec/mpegvideo.h | |
| parent | b73aae6fe9b78905635f138c931da621f83aaa31 (diff) | |
| parent | 75af13a0e4c54ee780249e16c8e14983614e2f25 (diff) | |
Merge commit '75af13a'
* commit '75af13a':
mpegvideo: directly use frames in 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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 8f7de9e90c..e519c87d2a 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -808,7 +808,7 @@ 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, Picture *cur, Picture *last, +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); |