diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-12 03:03:01 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-12 03:35:29 +0100 |
commit | 7c97946d6131b31340954a3f603b6bf92590a9a5 (patch) | |
tree | c18e9e494c01b27ae2d43427d394372b6dd61d1c /libavcodec/mpeg4video.h | |
parent | d50b5d547f4070678c88aa095b5292c872e2c1dc (diff) | |
download | ffmpeg-7c97946d6131b31340954a3f603b6bf92590a9a5.tar.gz |
avcodec/mpeg4video: Check time_incr
Fixes assertion failure
Fixes out of memory access
Fixes: test_casex.ivf
Found-by: Tyson Smith <twsmith@mozilla.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mpeg4video.h')
-rw-r--r-- | libavcodec/mpeg4video.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index 49bc13f87a..5998c7191c 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -140,7 +140,7 @@ void ff_mpeg4_encode_mb(MpegEncContext *s, void ff_mpeg4_pred_ac(MpegEncContext *s, int16_t *block, int n, int dir); void ff_set_mpeg4_time(MpegEncContext *s); -void ff_mpeg4_encode_picture_header(MpegEncContext *s, int picture_number); +int ff_mpeg4_encode_picture_header(MpegEncContext *s, int picture_number); int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb); void ff_mpeg4_encode_video_packet_header(MpegEncContext *s); |