On 2014-01-29 14:14:46 +0100, Diego Biurrun wrote:
> ---
> libavcodec/mpegvideo.c | 10 ++++------
> libavcodec/mpegvideo.h | 7 +++----
> libavcodec/svq3.c | 5 +++--
> 3 files changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
> index 7b66568..d26bcbe 100644
> --- a/libavcodec/mpegvideo.c
> +++ b/libavcodec/mpegvideo.c
> @@ -2338,10 +2338,9 @@ void ff_MPV_decode_mb(MpegEncContext *s, int16_t
> block[12][64]){
> /**
> * @param h is the normal height, this will be reduced automatically if
> needed for the last row
> */
> -void ff_draw_horiz_band(AVCodecContext *avctx, DSPContext *dsp, Picture *cur,
> +void ff_draw_horiz_band(AVCodecContext *avctx, 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)
> + int first_field, int low_delay)
> {
> const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
> int vshift = desc->log2_chroma_h;
> @@ -2390,10 +2389,9 @@ void ff_draw_horiz_band(AVCodecContext *avctx,
> DSPContext *dsp, Picture *cur,
>
> void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int h)
> {
> - ff_draw_horiz_band(s->avctx, &s->dsp, &s->current_picture,
> + ff_draw_horiz_band(s->avctx, &s->current_picture,
> &s->last_picture, y, h, s->picture_structure,
> - s->first_field, s->low_delay,
> - s->v_edge_pos, s->h_edge_pos);
> + s->first_field, s->low_delay);
> }
>
> void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename
> diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
> index 1c7248e..2d37860 100644
> --- a/libavcodec/mpegvideo.h
> +++ b/libavcodec/mpegvideo.h
> @@ -810,10 +810,9 @@ void ff_MPV_common_init_x86(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);
> void ff_print_debug_info(MpegEncContext *s, Picture *p);
> diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
> index 894180b..638c2b7 100644
> --- a/libavcodec/svq3.c
> +++ b/libavcodec/svq3.c
> @@ -1271,9 +1271,10 @@ static int svq3_decode_frame(AVCodecContext *avctx,
> void *data,
> (h->pict_type == AV_PICTURE_TYPE_P && mb_type < 8) ?
> (mb_type - 1) : -1;
> }
>
> - ff_draw_horiz_band(avctx, NULL, s->cur_pic, s->last_pic->f.data[0] ?
> s->last_pic : NULL,
> + ff_draw_horiz_band(avctx, s->cur_pic,
> + s->last_pic->f.data[0] ? s->last_pic : NULL,
> 16 * h->mb_y, 16, h->picture_structure, 0,
> - h->low_delay, h->mb_height * 16, h->mb_width *
> 16);
> + h->low_delay);
> }
>
> if (h->pict_type == AV_PICTURE_TYPE_B || h->low_delay)
ok
Janne
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
