Merge remote-tracking branch 'qatar/master'

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

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

diff --cc libavcodec/svq3.c
index 5ff50da0d964af28e58c4b00b42c64983800e833,ce42fcf8d3e0706e9b6f2a25f15a04813f767d21..4b932ef87bf4175b54864cf3e84d9000511e6125
--- 1/libavcodec/svq3.c
--- 2/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@@ -886,9 -880,9 +886,10 @@@ static av_cold int svq3_decode_init(AVC
      ff_hpeldsp_init(&s->hdsp, avctx->flags);
      h->flags           = avctx->flags;
      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;