summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-13 23:44:01 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-14 00:09:01 +0100
commitc13e4e288c84ba0629ead15e1460c0e498ee2bce (patch)
treed676d5647f2aa8f880ba58c5a9e99ca113c34594 /libavcodec/h264.c
parent2d8d63a9a07c8dca3587bd2a7b3ac56b2cbbeb24 (diff)
downloadffmpeg-streaming-c13e4e288c84ba0629ead15e1460c0e498ee2bce.zip
ffmpeg-streaming-c13e4e288c84ba0629ead15e1460c0e498ee2bce.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>
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c2
1 files changed, 1 insertions, 1 deletions
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;
}
OpenPOWER on IntegriCloud