diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-27 01:40:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-27 01:40:18 +0100 |
| commit | 3c8493074bc43aced247a34d6b981e6f9acde0f1 (patch) | |
| tree | 99b7984ed8e49d397c4cb3dab184454e26e122f1 /libavcodec/mpegvideo.c | |
| parent | b0efaee6c1a07b4e7575bf523542ce846202b6e2 (diff) | |
| parent | 1500be13f204acb7e74dac4325ef0052576fa2a9 (diff) | |
| download | ffmpeg-streaming-3c8493074bc43aced247a34d6b981e6f9acde0f1.zip ffmpeg-streaming-3c8493074bc43aced247a34d6b981e6f9acde0f1.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* 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>
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index aa5378b..dd003b4 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1165,9 +1165,9 @@ void MPV_frame_end(MpegEncContext *s) && !(s->flags&CODEC_FLAG_EMU_EDGE)) { 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); } |
