Merge commit 'b56afb48aecb96e03347f5b569f16a64147c18b1'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 21:07:21 +0000 (22:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 21:10:12 +0000 (22:10 +0100)
* commit 'b56afb48aecb96e03347f5b569f16a64147c18b1':
  mpeg12dec: Print error/warning messages on issues in mpeg1_decode_sequence()

Conflicts:
libavcodec/mpeg12dec.c

See: 88b4c1a7316cf47f68bf04accf613375b7326992
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mpeg12dec.c

@@@ -2125,8 -2083,9 +2125,9 @@@ static int mpeg1_decode_sequence(AVCode
      }
      s->frame_rate_index = get_bits(&s->gb, 4);
      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);
+         av_log(avctx, AV_LOG_WARNING,
+                "frame_rate_index %d is invalid\n", s->frame_rate_index);
 -        return -1;
 +        s->frame_rate_index = 1;
      }
      s->bit_rate = get_bits(&s->gb, 18) * 400;
      if (get_bits1(&s->gb) == 0) { /* marker */