[FFmpeg-cvslog] libx264: do not set pic quality if no frame is output

Baptiste Coudurier git at videolan.org
Sat Oct 1 22:47:28 CEST 2011


ffmpeg | branch: release/0.8 | Baptiste Coudurier <baptiste.coudurier at gmail.com> | Sat Jan 29 17:05:42 2011 -0800| [67163d751ba1ffa89e61eff224158828d5f673a4] | committer: Reinhard Tartler

libx264: do not set pic quality if no frame is output

Avoids uninitialized reads.

Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 5caa2de19ece830e32c95731bc92a423d55cff0c)

Signed-off-by: Anton Khirnov <anton at khirnov.net>

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

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

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index e5fac00..74ee1d4 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -138,7 +138,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;
 }



More information about the ffmpeg-cvslog mailing list