Merge commit '6612a03d7470af4aa6b8aa313b1eff013691d181'

* commit '6612a03d7470af4aa6b8aa313b1eff013691d181': fraps: set color_range Conflicts: libavcodec/fraps.c See: 79f452f4e6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · ca0e6fa731
parent 1c79ca272d 6612a03d74
commit ca0e6fa731
1 changed files with 2 additions and 1 deletions
--- 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)