Merge commit '036f5c5420e4529f05fa5180f5fa28ca2c5c4065' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 23:24:57 +0000 (00:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 23:25:10 +0000 (00:25 +0100)
* commit '036f5c5420e4529f05fa5180f5fa28ca2c5c4065':
  rm: Use the correct codec_data_size signedness

Conflicts:
libavformat/rm.h
libavformat/rmdec.c

See: a6f730730b82645a9d31aad0968487cb77d6946c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rdt.c
libavformat/rm.h
libavformat/rmdec.c

Simple merge
@@@ -50,7 -50,7 +50,7 @@@ extern AVInputFormat ff_rdt_demuxer
   */
  int ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVIOContext *pb,
                                 AVStream *st, RMStream *rst,
-                                int codec_data_size, const uint8_t *mime);
 -                               unsigned int codec_data_size);
++                               unsigned int codec_data_size, const uint8_t *mime);
  
  /**
   * Parse one rm-stream packet from the input bytestream.
@@@ -303,18 -282,15 +303,18 @@@ static int rm_read_audio_stream_info(AV
      return 0;
  }
  
- int
- ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVIOContext *pb,
-                            AVStream *st, RMStream *rst, int codec_data_size, const uint8_t *mime)
+ int ff_rm_read_mdpr_codecdata(AVFormatContext *s, AVIOContext *pb,
+                               AVStream *st, RMStream *rst,
 -                              unsigned int codec_data_size)
++                              unsigned int codec_data_size, const uint8_t *mime)
  {
      unsigned int v;
      int size;
      int64_t codec_pos;
      int ret;
  
-     if (codec_data_size < 0)
++    if (codec_data_size > INT_MAX)
 +        return AVERROR_INVALIDDATA;
 +
      avpriv_set_pts_info(st, 64, 1, 1000);
      codec_pos = avio_tell(pb);
      v = avio_rb32(pb);