diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:13:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:13:12 +0100 |
| commit | 756dc7bd18b88fdde5c06c701375a6570500e58c (patch) | |
| tree | 731502f3a57bdcc81d35202cc50da7770f38ef68 /libavcodec/svq3.c | |
| parent | 06c70d45373dedc600f28e345685b130b60203c1 (diff) | |
| parent | 92c6c2a605f9b077b8fbc25b7ed6625541232b87 (diff) | |
| download | ffmpeg-756dc7bd18b88fdde5c06c701375a6570500e58c.tar.gz | |
Merge commit '92c6c2a605f9b077b8fbc25b7ed6625541232b87'
* commit '92c6c2a605f9b077b8fbc25b7ed6625541232b87':
h264: split weighted pred-related vars into per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_mb.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq3.c')
| -rw-r--r-- | libavcodec/svq3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 5205e13093..0ddcd6a7b4 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1303,7 +1303,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, } if (mb_type != 0 || h->cbp) - ff_h264_hl_decode_mb(h); + ff_h264_hl_decode_mb(h, &h->slice_ctx[0]); if (h->pict_type != AV_PICTURE_TYPE_B && !h->low_delay) h->cur_pic.mb_type[h->mb_x + h->mb_y * h->mb_stride] = |