diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-18 14:08:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-18 14:08:40 +0100 |
| commit | c56d25c4764fee4b7b0e94212ff279f34c8ba0c8 (patch) | |
| tree | ae98c8d27ec26a25e639dbd1d4a18162bc8840ff | |
| parent | 7ae5cadb0ace6e76640133fa9e6eeca294e2d7bf (diff) | |
| parent | 3795ec68588986b1b88c884deaab37554dfc8203 (diff) | |
| download | ffmpeg-c56d25c4764fee4b7b0e94212ff279f34c8ba0c8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
svq3: directly set pix_fmt and color_range
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/svq3.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 5ff50da0d9..4b932ef87b 100644 --- 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; |