aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/svq3.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-01-17 22:28:46 +0100
committerAnton Khirnov <anton@khirnov.net>2015-03-21 11:27:14 +0100
commit07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa (patch)
treedba091d3cb6911a25d6179f19fd8e99da7efe038 /libavcodec/svq3.c
parent47a0d393504d6726c4a235951153bee0abb3f7d6 (diff)
downloadffmpeg-07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa.tar.gz
h264: move is_complex into the per-slice context
Diffstat (limited to 'libavcodec/svq3.c')
-rw-r--r--libavcodec/svq3.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index d8aefa633e..cb418c6220 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -866,6 +866,7 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
{
SVQ3Context *s = avctx->priv_data;
H264Context *h = &s->h;
+ H264SliceContext *sl;
int m;
unsigned char *extradata;
unsigned char *extradata_end;
@@ -888,8 +889,10 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
ff_hpeldsp_init(&s->hdsp, avctx->flags);
ff_tpeldsp_init(&s->tdsp);
+ sl = h->slice_ctx;
+
h->flags = avctx->flags;
- h->is_complex = 1;
+ sl->is_complex = 1;
h->picture_structure = PICT_FRAME;
avctx->pix_fmt = AV_PIX_FMT_YUVJ420P;
avctx->color_range = AVCOL_RANGE_JPEG;