Merge pull request #4314 from MartijnKaijser/beta1
[vuplus_xbmc] / lib / ffmpeg / patches / 0064-ffmpeg-backport-vc1-dxva2-improvements-intel-compat-2.patch
1 From 3021d1be9ef1f863f880b5c667025936b45da065 Mon Sep 17 00:00:00 2001
2 From: Hendrik Leppkes <h.leppkes@gmail.com>
3 Date: Thu, 12 Dec 2013 21:12:49 +0100
4 Subject: [PATCH] dxva2_vc1: set bfraction in slice info according to spec
5
6 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 ---
8  xbmc/lib/ffmpeg/libavcodec/dxva2_vc1.c | 2 +-
9  1 file changed, 1 insertion(+), 1 deletion(-)
10
11 diff --git a/xbmc/lib/ffmpeg/libavcodec/dxva2_vc1.c b/xbmc/lib/ffmpeg/libavcodec/dxva2_vc1.c
12 index 6ff5765..33309b1 100644
13 --- a/xbmc/lib/ffmpeg/libavcodec/dxva2_vc1.c
14 +++ b/xbmc/lib/ffmpeg/libavcodec/dxva2_vc1.c
15 @@ -148,7 +148,7 @@ static void fill_slice(AVCodecContext *avctx, DXVA_SliceInfo *slice,
16      slice->dwSliceBitsInBuffer = 8 * size;
17      slice->dwSliceDataLocation = position;
18      slice->bStartCodeBitOffset = 0;
19 -    slice->bReservedBits       = 0;
20 +    slice->bReservedBits       = (s->pict_type == AV_PICTURE_TYPE_B && !v->bi_type) ? v->bfraction_lut_index + 9 : 0;
21      slice->wMBbitOffset        = get_bits_count(&s->gb);
22      slice->wNumberMBsInSlice   = s->mb_width * s->mb_height; /* XXX We assume 1 slice */
23      slice->wQuantizerScaleCode = v->pq;
24 -- 
25 1.8.5.1
26