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)
commita16c512374ca8c0661fa02818f075e4ac4c15896
tree86e73958de007cfa7d0172ea864fb82ac17c4698
parent1df2e3c707d394ae28159400374ead8d7230f443
parentc9a39cec70603f662f4c326b21b11c4f0112079a
Merge commit 'c9a39cec70603f662f4c326b21b11c4f0112079a'

* 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>
libavformat/matroskadec.c