diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-13 23:44:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-18 05:14:31 +0100 |
| commit | 30f0cd2f1e760b085b5288d62e4de23955829c49 (patch) | |
| tree | 73675804b5b171bd932356c26324e943a7f5774d /libavcodec/h264.c | |
| parent | 4d6d8d9ae943e37667176a6968a183454f73215c (diff) | |
| download | ffmpeg-30f0cd2f1e760b085b5288d62e4de23955829c49.tar.gz | |
h264: fix () placement
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c13e4e288c84ba0629ead15e1460c0e498ee2bce)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index f6cfa1a35d..d5009bfb80 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; } |