Merge commit '6612a03d'

* commit '6612a03d': fraps: set color_range Conflicts: libavcodec/fraps.c See: 79f452f4Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '6612a03d'
* commit '6612a03d': fraps: set color_range Conflicts: libavcodec/fraps.c See: 79f452f4Merged-by: Michael Niedermayer <michaelni@gmx.at>
ca0e6fa7 · Michael Niedermayer · 1c79ca27 · 6612a03d · ca0e6fa7
Commit ca0e6fa7 authored Mar 17, 2014 by Michael Niedermayer
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

fraps.c libavcodec/fraps.c +2 -1

No files found.
--- 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)