Merge remote-tracking branch 'newdev/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Mar 2011 00:40:18 +0000 (01:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Mar 2011 00:40:18 +0000 (01:40 +0100)
* newdev/master:
  dsputil: allow to skip drawing of top/bottom edges.
  Split fate-psx-str-v3 into a video-only and audio-only test.

Conflicts:
libavcodec/dsputil.c
libavcodec/mpegvideo.c
libavcodec/snow.c
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dsputil.c
libavcodec/mpegvideo.c
libavcodec/x86/dsputil_mmx.c

Simple merge
@@@ -1163,14 -1067,16 +1163,14 @@@ void MPV_frame_end(MpegEncContext *s
         && s->current_picture.reference
         && !s->intra_only
         && !(s->flags&CODEC_FLAG_EMU_EDGE)) {
 -            s->dsp.draw_edges(s->current_picture.data[0], s->linesize  ,
 -                              s->h_edge_pos   , s->v_edge_pos   ,
 -                              EDGE_WIDTH  , EDGE_TOP | EDGE_BOTTOM);
 -            s->dsp.draw_edges(s->current_picture.data[1], s->uvlinesize,
 -                              s->h_edge_pos>>1, s->v_edge_pos>>1,
 -                              EDGE_WIDTH/2, EDGE_TOP | EDGE_BOTTOM);
 -            s->dsp.draw_edges(s->current_picture.data[2], s->uvlinesize,
 -                              s->h_edge_pos>>1, s->v_edge_pos>>1,
 -                              EDGE_WIDTH/2, EDGE_TOP | EDGE_BOTTOM);
 +        int edges = EDGE_BOTTOM | EDGE_TOP, h = s->v_edge_pos;
 +
-             s->dsp.draw_edges(s->current_picture_ptr->data[0], s->linesize  , s->h_edge_pos   , h   , EDGE_WIDTH  , edges);
-             s->dsp.draw_edges(s->current_picture_ptr->data[1], s->uvlinesize, s->h_edge_pos>>1, h>>1, EDGE_WIDTH/2, edges);
-             s->dsp.draw_edges(s->current_picture_ptr->data[2], s->uvlinesize, s->h_edge_pos>>1, h>>1, EDGE_WIDTH/2, edges);
++            s->dsp.draw_edges(s->current_picture.data[0], s->linesize  , s->h_edge_pos   , h   , EDGE_WIDTH  , edges);
++            s->dsp.draw_edges(s->current_picture.data[1], s->uvlinesize, s->h_edge_pos>>1, h>>1, EDGE_WIDTH/2, edges);
++            s->dsp.draw_edges(s->current_picture.data[2], s->uvlinesize, s->h_edge_pos>>1, h>>1, EDGE_WIDTH/2, edges);
 +
      }
 +
      emms_c();
  
      s->last_pict_type    = s->pict_type;
Simple merge