diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-13 23:44:01 +0100 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-01-14 13:12:38 +0200 |
| commit | 59d5680310084398dc6eb8fa62d56a7d1c9b85e0 (patch) | |
| tree | c936962ee0a476fc14563c4e540b7eb1fe6dd2cf | |
| parent | 60a42ef44cc02a8b6a0f0b92ab92c6f9a4ddc838 (diff) | |
| download | ffmpeg-59d5680310084398dc6eb8fa62d56a7d1c9b85e0.tar.gz | |
h264: Fix assignments in if()
Fixes null pointer dereference later, since if this function failed,
a positive return value was returned to the caller.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Martin Storsjö <martin@martin.st>
| -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 366059722f..f1cac2cac1 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2527,7 +2527,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; } |