har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  mpeg: Drop unused parameters from ff_draw_horiz_band()

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-29 17:05:12 +01:00
commit fbafd64acc
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/mpegvideo.c
View File

@ -3022,10 +3022,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 * @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, Picture *last, int y, int h, int picture_structure,
int first_field, int low_delay, int first_field, int low_delay)
int v_edge_pos, int h_edge_pos)
{ {
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
int vshift = desc->log2_chroma_h; int vshift = desc->log2_chroma_h;
@ -3074,10 +3073,9 @@ void ff_draw_horiz_band(AVCodecContext *avctx, DSPContext *dsp, Picture *cur,
void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int h) void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int h)
{ {
ff_draw_horiz_band(s->avctx, &s->dsp, s->current_picture_ptr, ff_draw_horiz_band(s->avctx, s->current_picture_ptr,
s->last_picture_ptr, y, h, s->picture_structure, s->last_picture_ptr, y, h, s->picture_structure,
s->first_field, s->low_delay, s->first_field, s->low_delay);
s->v_edge_pos, s->h_edge_pos);
} }
void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename

7
libavcodec/mpegvideo.h
View File

@ -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_arm(MpegEncContext *s);
void ff_MPV_common_init_ppc(MpegEncContext *s); void ff_MPV_common_init_ppc(MpegEncContext *s);
void ff_clean_intra_table_entries(MpegEncContext *s); void ff_clean_intra_table_entries(MpegEncContext *s);
void ff_draw_horiz_band(AVCodecContext *avctx, DSPContext *dsp, Picture *cur, void ff_draw_horiz_band(AVCodecContext *avctx, Picture *cur, Picture *last,
Picture *last, int y, int h, int picture_structure, int y, int h, int picture_structure, int first_field,
int first_field, int low_delay, 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_draw_horiz_band(MpegEncContext *s, int y, int h);
void ff_mpeg_flush(AVCodecContext *avctx); void ff_mpeg_flush(AVCodecContext *avctx);

5
libavcodec/svq3.c
View File

@ -1298,9 +1298,10 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data,
(h->pict_type == AV_PICTURE_TYPE_P && mb_type < 8) ? (mb_type - 1) : -1; (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, 16 * h->mb_y, 16, h->picture_structure, 0,
h->low_delay, h->mb_height * 16, h->mb_width * 16); h->low_delay);
} }
left = buf_size*8 - get_bits_count(&h->gb); left = buf_size*8 - get_bits_count(&h->gb);