[FFmpeg-cvslog] lavc/vaapi_encode_h26x: Fix a crash if "." is not the decimal separator.

Carl Eugen Hoyos git at videolan.org
Sat Aug 6 00:00:15 EEST 2016


ffmpeg | branch: release/3.1 | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Aug  2 19:02:09 2016 +0200| [c70b1ae93023831664588726e32f8fcd7db4250b] | committer: Carl Eugen Hoyos

lavc/vaapi_encode_h26x: Fix a crash if "." is not the decimal separator.

Fixes Debian bugs #831529, #831909, #832964.

Signed-off-by: Mark Thompson <sw at jkqxz.net>
(cherry picked from commit 82e53b3cef924f250f928fca6348204e2ace90d8)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c70b1ae93023831664588726e32f8fcd7db4250b
---

 libavcodec/vaapi_encode_h264.c | 8 ++++----
 libavcodec/vaapi_encode_h265.c | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
index 39e2ec0..ece6314 100644
--- a/libavcodec/vaapi_encode_h264.c
+++ b/libavcodec/vaapi_encode_h264.c
@@ -967,10 +967,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 c42c08e..cb376b1 100644
--- a/libavcodec/vaapi_encode_h265.c
+++ b/libavcodec/vaapi_encode_h265.c
@@ -1338,10 +1338,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 },
 };
 



More information about the ffmpeg-cvslog mailing list