diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 14:36:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 15:18:46 +0200 |
| commit | 59a53842d360ddaf883a0415b11013038fa57da0 (patch) | |
| tree | bec280eb85d158ae75e54268cef1ebdd47be563c /libavcodec/rv40.c | |
| parent | 60ef0c6f909703ae4dc021f6857d254c7badc1ec (diff) | |
| parent | f6774f905fb3cfdc319523ac640be30b14c1bc55 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: operate with pointers to AVFrames instead of whole structs
Conflicts:
libavcodec/h261dec.c
libavcodec/h263dec.c
libavcodec/intrax8.c
libavcodec/mpeg12enc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/mpegvideo_xvmc.c
libavcodec/msmpeg4.c
libavcodec/ratecontrol.c
libavcodec/vaapi.c
libavcodec/vc1dec.c
libavcodec/vdpau_vc1.c
See: fc567ac49e17151f00f31b59030cd10f952612ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv40.c')
| -rw-r--r-- | libavcodec/rv40.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index 6b0ecdbe4d..043fd724a9 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -456,7 +456,7 @@ static void rv40_loop_filter(RV34DecContext *r, int row) } for(j = 0; j < 16; j += 4){ - Y = s->current_picture_ptr->f.data[0] + mb_x*16 + (row*16 + j) * s->linesize; + Y = s->current_picture_ptr->f->data[0] + mb_x*16 + (row*16 + j) * s->linesize; for(i = 0; i < 4; i++, Y += 4){ int ij = i + j; int clip_cur = y_to_deblock & (MASK_CUR << ij) ? clip[POS_CUR] : 0; @@ -501,7 +501,7 @@ static void rv40_loop_filter(RV34DecContext *r, int row) } for(k = 0; k < 2; k++){ for(j = 0; j < 2; j++){ - C = s->current_picture_ptr->f.data[k + 1] + mb_x*8 + (row*8 + j*4) * s->uvlinesize; + C = s->current_picture_ptr->f->data[k + 1] + mb_x*8 + (row*8 + j*4) * s->uvlinesize; for(i = 0; i < 2; i++, C += 4){ int ij = i + j*2; int clip_cur = c_to_deblock[k] & (MASK_CUR << ij) ? clip[POS_CUR] : 0; |