diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 15:56:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 15:58:02 +0100 |
| commit | ca0e6fa7317cbc0677f6e90945a61baef3937915 (patch) | |
| tree | cce55a4bc9cd225afd686d7a00a191e60f18c0fa | |
| parent | 1c79ca272de8a94ef7a7cc4352645a1013cf9be3 (diff) | |
| parent | 6612a03d7470af4aa6b8aa313b1eff013691d181 (diff) | |
| download | ffmpeg-ca0e6fa7317cbc0677f6e90945a61baef3937915.tar.gz | |
Merge commit '6612a03d7470af4aa6b8aa313b1eff013691d181'
* commit '6612a03d7470af4aa6b8aa313b1eff013691d181':
fraps: set color_range
Conflicts:
libavcodec/fraps.c
See: 79f452f4e68696f1daa9f205b35037185959c9ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/fraps.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index 225da11299..4f89af1e58 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -207,7 +207,8 @@ static int decode_frame(AVCodecContext *avctx, f->key_frame = 1; avctx->pix_fmt = version & 1 ? AV_PIX_FMT_BGR24 : AV_PIX_FMT_YUVJ420P; - avctx->color_range = version & 1 ? AVCOL_RANGE_UNSPECIFIED : AVCOL_RANGE_JPEG; + avctx->color_range = version & 1 ? AVCOL_RANGE_UNSPECIFIED + : AVCOL_RANGE_JPEG; avctx->colorspace = version & 1 ? AVCOL_SPC_UNSPECIFIED : AVCOL_SPC_BT709; if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) |