[FFmpeg-cvslog] h264: assert that croping values at slice level are consistent

Michael Niedermayer git at videolan.org
Wed May 1 00:27:28 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 30 23:49:56 2013 +0200| [5299ee54a73ff1c4d4a4a3ee7b84dae2ffb2fb5f] | committer: Michael Niedermayer

h264: assert that croping values at slice level are consistent

These values where checked before already.

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

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

 libavcodec/h264.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 502ee92..03b6bda 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3055,6 +3055,8 @@ static int init_dimensions(H264Context *h)
 {
     int width  = h->width  - (h->sps.crop_right + h->sps.crop_left);
     int height = h->height - (h->sps.crop_top   + h->sps.crop_bottom);
+    av_assert0(h->sps.crop_right + h->sps.crop_left < (unsigned)h->width);
+    av_assert0(h->sps.crop_top + h->sps.crop_bottom < (unsigned)h->height);
 
     /* handle container cropping */
     if (!h->sps.crop &&



More information about the ffmpeg-cvslog mailing list