[FFmpeg-cvslog] avcodec/mpeg12dec: Print error/ warning messages on issues in mpeg1_decode_sequence()

Michael Niedermayer git at videolan.org
Thu Nov 20 15:17:54 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 20 15:08:18 2014 +0100| [88b4c1a7316cf47f68bf04accf613375b7326992] | committer: Michael Niedermayer

avcodec/mpeg12dec: Print error/warning messages on issues in mpeg1_decode_sequence()

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

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

 libavcodec/mpeg12dec.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index baa8e81..34dbebf 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -2121,11 +2121,15 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
             return -1;
     }
     s->frame_rate_index = get_bits(&s->gb, 4);
-    if (s->frame_rate_index == 0 || s->frame_rate_index > 13)
+    if (s->frame_rate_index == 0 || s->frame_rate_index > 13) {
+        av_log(avctx, AV_LOG_WARNING, "frame_rate_index %d is invalid\n", s->frame_rate_index);
         return -1;
+    }
     s->bit_rate = get_bits(&s->gb, 18) * 400;
-    if (get_bits1(&s->gb) == 0) /* marker */
+    if (get_bits1(&s->gb) == 0) { /* marker */
+        av_log(avctx, AV_LOG_ERROR, "Marker in sequence header missing\n");
         return -1;
+    }
     s->width  = width;
     s->height = height;
 



More information about the ffmpeg-cvslog mailing list