[FFmpeg-cvslog] h264: fix () placement

Michael Niedermayer git at videolan.org
Mon Jan 14 00:25:01 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 13 23:44:01 2013 +0100| [c13e4e288c84ba0629ead15e1460c0e498ee2bce] | committer: Michael Niedermayer

h264: fix () placement

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/h264.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 1197a65..3b7ad98 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2589,7 +2589,7 @@ static int h264_slice_header_init(H264Context *h, int reinit)
             return ret;
         }
     } else {
-        if ((ret = ff_MPV_common_init(s) < 0)) {
+        if ((ret = ff_MPV_common_init(s)) < 0) {
             av_log(h->s.avctx, AV_LOG_ERROR, "ff_MPV_common_init() failed.\n");
             return ret;
         }



More information about the ffmpeg-cvslog mailing list