Merge remote-tracking branch 'qatar/master'

* qatar/master:
  svq3: directly set pix_fmt and color_range

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index 5ff50da0d964af28e58c4b00b42c64983800e833..4b932ef87bf4175b54864cf3e84d9000511e6125 100644 (file)
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -888,7 +888,8 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
     h->is_complex      = 1;
     h->sps.chroma_format_idc = 1;
     h->picture_structure = PICT_FRAME;
-    avctx->pix_fmt     = avctx->codec->pix_fmts[0];
+    avctx->pix_fmt     = AV_PIX_FMT_YUVJ420P;
+    avctx->color_range = AVCOL_RANGE_JPEG;
 
     h->chroma_qp[0] = h->chroma_qp[1] = 4;
     h->chroma_x_shift = h->chroma_y_shift = 1;