[libav-devel] [PATCH 3/6] In libx264 wrapper, do not set pic quality if no frame is output, avoids uninitialized reads. (cherry picked from commit 46f83e5b3c17a46fa9c86421e7b511cd00cb5d60)

2011-04-20 Thread Alex Converse
---
 libavcodec/libx264.c |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index df4c577..82f769a 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -144,7 +144,8 @@ static int X264_frame(AVCodecContext *ctx, uint8_t *buf,
 }
 
 x4-out_pic.key_frame = pic_out.b_keyframe;
-x4-out_pic.quality   = (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA;
+if (bufsize)
+x4-out_pic.quality = (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA;
 
 return bufsize;
 }
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel


Re: [libav-devel] [PATCH 3/6] In libx264 wrapper, do not set pic quality if no frame is output, avoids uninitialized reads. (cherry picked from commit 46f83e5b3c17a46fa9c86421e7b511cd00cb5d60)

2011-04-20 Thread Aℓex Converse
On Wed, Apr 20, 2011 at 3:40 PM, Alex Converse aconve...@google.com wrote:
 ---
  libavcodec/libx264.c |    3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


From 8f0f1bbd47e38a1303cd969399d34168d15f33ca Mon Sep 17 00:00:00 2001
From: Baptiste Coudurier baptiste.coudur...@gmail.com
Date: Sat, 29 Jan 2011 17:05:42 -0800
Subject: [PATCH 3/6] In libx264 wrapper, do not set pic quality if no frame is output, avoids
 uninitialized reads.
 (cherry picked from commit 46f83e5b3c17a46fa9c86421e7b511cd00cb5d60)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary=1

This is a multi-part message in MIME format.
--1
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit

---
 libavcodec/libx264.c |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


--1
Content-Type: text/x-patch; name=0003-In-libx264-wrapper-do-not-set-pic-quality-if-no-fram.patch
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename=0003-In-libx264-wrapper-do-not-set-pic-quality-if-no-fram.patch

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index df4c577..82f769a 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -144,7 +144,8 @@ static int X264_frame(AVCodecContext *ctx, uint8_t *buf,
 }
 
 x4-out_pic.key_frame = pic_out.b_keyframe;
-x4-out_pic.quality   = (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA;
+if (bufsize)
+x4-out_pic.quality = (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA;
 
 return bufsize;
 }

--1--


___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel