diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:10:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:10:31 +0100 |
| commit | db4234c5002fc0ac7ecae323874b97a4547ae0c3 (patch) | |
| tree | e1953f9959ad4bde6e5a2240a81d42673ac6b83b /libavcodec/svq3.c | |
| parent | 70eec8f432dcee5b9867ba01a26436a04a9a0423 (diff) | |
| parent | 07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa (diff) | |
| download | ffmpeg-streaming-db4234c5002fc0ac7ecae323874b97a4547ae0c3.zip ffmpeg-streaming-db4234c5002fc0ac7ecae323874b97a4547ae0c3.tar.gz | |
Merge commit '07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa'
* commit '07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa':
h264: move is_complex into the per-slice context
Conflicts:
libavcodec/h264_slice.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq3.c')
| -rw-r--r-- | libavcodec/svq3.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 009fe13..077eccb 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -873,6 +873,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; @@ -894,8 +895,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->sps.chroma_format_idc = 1; h->picture_structure = PICT_FRAME; avctx->pix_fmt = AV_PIX_FMT_YUVJ420P; |
