[SCM] ffmpeg/master: Temporary workaround for local dependent parsing

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4d21cf7cd28097e86130b6e416c2ea0b64b6efd2
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Aug 3 15:15:54 2016 +0200

    Temporary workaround for local dependent parsing

diff --git a/debian/patches/fix-vaapi-default-values.patch b/debian/patches/fix-vaapi-default-values.patch
new file mode 100644
index 0000000..a664f29
--- /dev/null
+++ b/debian/patches/fix-vaapi-default-values.patch
@@ -0,0 +1,41 @@
+Description: Use local independentant default values
+Author: Carl Eugen Hoyos
+
+diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
+index 979cf37..5bed4e4 100644
+--- a/libavcodec/vaapi_encode_h264.c
++++ b/libavcodec/vaapi_encode_h264.c
+@@ -1323,10 +1323,10 @@ static const AVCodecDefault vaapi_encode_h264_defaults[] = {
+     { "b",              "0"   },
+     { "bf",             "2"   },
+     { "g",              "120" },
+-    { "i_qfactor",      "1.0" },
+-    { "i_qoffset",      "0.0" },
+-    { "b_qfactor",      "1.2" },
+-    { "b_qoffset",      "0.0" },
++    { "i_qfactor",      "1"   },
++    { "i_qoffset",      "0"   },
++    { "b_qfactor",      "6/5" },
++    { "b_qoffset",      "0"   },
+     { NULL },
+ };
+ 
+diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c
+index 1ef968c..45f6f6d 100644
+--- a/libavcodec/vaapi_encode_h265.c
++++ b/libavcodec/vaapi_encode_h265.c
+@@ -1341,10 +1341,10 @@ static const AVCodecDefault vaapi_encode_h265_defaults[] = {
+     { "b",              "0"   },
+     { "bf",             "2"   },
+     { "g",              "120" },
+-    { "i_qfactor",      "1.0" },
+-    { "i_qoffset",      "0.0" },
+-    { "b_qfactor",      "1.2" },
+-    { "b_qoffset",      "0.0" },
++    { "i_qfactor",      "1"   },
++    { "i_qoffset",      "0"   },
++    { "b_qfactor",      "6/5" },
++    { "b_qoffset",      "0"   },
+     { NULL },
+ };
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 4f237f9..c985bf7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 disable-opj-static.patch
 Revert-configure-Enable-GCC-vectorization-on-4.9-on-.patch
+fix-vaapi-default-values.patch

-- 
ffmpeg packaging