Merge commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 11:03:40 +0000 (13:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 11:03:40 +0000 (13:03 +0200)
* commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1':
  h264_ps: Use more meaningful error values

Conflicts:
libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264_ps.c

@@@ -253,10 -225,9 +253,10 @@@ static inline int decode_vui_parameters
              /* max_dec_frame_buffering || max_dec_frame_buffering > 16 */) {
              av_log(h->avctx, AV_LOG_ERROR,
                     "illegal num_reorder_frames %d\n", sps->num_reorder_frames);
-             return -1;
+             return AVERROR_INVALIDDATA;
          }
      }
 +
      if (get_bits_left(&h->gb) < 0) {
          av_log(h->avctx, AV_LOG_ERROR,
                 "Overread VUI by %d bits\n", -get_bits_left(&h->gb));