[FFmpeg-cvslog] h264: fix () placement

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 13 23:44:01 2013 +0100| [30f0cd2f1e760b085b5288d62e4de23955829c49] | 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>
(cherry picked from commit c13e4e288c84ba0629ead15e1460c0e498ee2bce)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index f6cfa1a..d5009bf 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;
         }