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>

diff --cc libavcodec/mpegvideo.c
index 39f40cc0eeb3bf1fa55adaccb20ae6d35c2c0c49,73778f51b4bbce97ac1430e4636a05450108b4fd..ebaeedd08b21ae3c7bb2cf18f4b79cd7a1568a3e
--- 1/libavcodec/mpegvideo.c
--- 2/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@@ -3074,10 -2364,9 +3073,9 @@@ void ff_draw_horiz_band(AVCodecContext 
  
  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,
 -                       &s->last_picture, y, h, s->picture_structure,
++    ff_draw_horiz_band(s->avctx, s->current_picture_ptr,
 +                       s->last_picture_ptr, 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 --cc libavcodec/mpegvideo.h
index 7ecb97eae45f81996861975fb0dc677880c21563,f88870052f4713b9ef435fbd0016097c705ef52c..47a58f74b47c1b512b3c73c037b0ea897fa1cf85
--- 1/libavcodec/mpegvideo.h
--- 2/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@@ -807,20 -784,12 +807,19 @@@ void ff_MPV_common_init_axp(MpegEncCont
  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);
 +
 +void ff_print_debug_info(MpegEncContext *s, Picture *p, AVFrame *pict);
 +void ff_print_debug_info2(AVCodecContext *avctx, Picture *p, AVFrame *pict, uint8_t *mbskip_table,
 +                         int *low_delay,
 +                         int mb_width, int mb_height, int mb_stride, int quarter_sample);
 +
 +int ff_mpv_export_qp_table(MpegEncContext *s, AVFrame *f, Picture *p, int qp_type);
 +
  void ff_write_quant_matrix(PutBitContext *pb, uint16_t *matrix);
  int ff_find_unused_picture(MpegEncContext *s, int shared);
  void ff_denoise_dct(MpegEncContext *s, int16_t *block);

diff --cc libavcodec/svq3.c
index 75dc3d5b9aa1a7fe63135cb31d0d3a3f8bc76fde,fac95eed5378c2889cf6ad2118ef08111c47c954..f41fa599c32c6e52338893afafb9c295e5919699
--- 1/libavcodec/svq3.c
--- 2/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@@ -1298,23 -1267,12 +1298,24 @@@ static int svq3_decode_frame(AVCodecCon
                      (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);
      }
  
 +    left = buf_size*8 - get_bits_count(&h->gb);
 +
 +    if (h->mb_y != h->mb_height || h->mb_x != h->mb_width) {
 +        av_log(avctx, AV_LOG_INFO, "frame num %d incomplete pic x %d y %d left %d\n", avctx->frame_number, h->mb_y, h->mb_x, left);
 +        //av_hex_dump(stderr, buf+buf_size-8, 8);
 +    }
 +
 +    if (left < 0) {
 +        av_log(avctx, AV_LOG_ERROR, "frame num %d left %d\n", avctx->frame_number, left);
 +        return -1;
 +    }
 +
      if (h->pict_type == AV_PICTURE_TYPE_B || h->low_delay)
          ret = av_frame_ref(data, &s->cur_pic->f);
      else if (s->last_pic->f.data[0])