Merge commit 'c9a39cec70603f662f4c326b21b11c4f0112079a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Sep 2012 11:40:47 +0000 (13:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Sep 2012 11:40:47 +0000 (13:40 +0200)
* commit 'c9a39cec70603f662f4c326b21b11c4f0112079a':
  matroskadec: return meaningful errors in matroska_decode_buffer
  matroskadec: fix incorrect unsigned->signed conversion

Conflicts:
libavformat/matroskadec.c

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

@@@ -1052,8 -990,8 +1052,8 @@@ static int matroska_decode_buffer(uint8
      int result = 0;
      int olen;
  
 -    if (pkt_size >= 10000000)
 +    if (pkt_size >= 10000000U)
-         return -1;
+         return AVERROR_INVALIDDATA;
  
      switch (encodings[0].compression.algo) {
      case MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP: {