diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 19:00:39 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 19:00:39 +0100 |
commit | ddbbfd95bee4105fcb75f3b7c039b6c08efe36b4 (patch) | |
tree | 6b89fa0cc6e1afa4f4e6f5fe8275ef54984bd9da /libavcodec/mpegvideo.h | |
parent | 1fad547cefb4d2f3ed3d764b547ee16cf399e477 (diff) | |
parent | 1d0feb5d1ac04d187b335f0e8d411c9f40b3a885 (diff) | |
download | ffmpeg-streaming-ddbbfd95bee4105fcb75f3b7c039b6c08efe36b4.zip ffmpeg-streaming-ddbbfd95bee4105fcb75f3b7c039b6c08efe36b4.tar.gz |
Merge commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885'
* commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885':
mpegvideo: split ff_draw_horiz_band().
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
-rw-r--r-- | libavcodec/mpegvideo.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 924bacc..73c50c9 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -774,7 +774,11 @@ void ff_MPV_common_init_arm(MpegEncContext *s); void ff_MPV_common_init_altivec(MpegEncContext *s); void ff_MPV_common_init_bfin(MpegEncContext *s); void ff_clean_intra_table_entries(MpegEncContext *s); -void ff_draw_horiz_band(MpegEncContext *s, int y, int h); +void ff_draw_horiz_band(AVCodecContext *avctx, DSPContext *dsp, Picture *cur, + Picture *last, int y, int h, int picture_structure, + int first_field, int draw_edges, int low_delay, + int v_edge_pos, int h_edge_pos); +void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int h); void ff_mpeg_flush(AVCodecContext *avctx); void ff_print_debug_info(MpegEncContext *s, AVFrame *pict); void ff_write_quant_matrix(PutBitContext *pb, uint16_t *matrix); |