[FFmpeg-cvslog] Merge commit 'c9a39cec70603f662f4c326b21b11c4f0112079a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 20 13:40:47 2012 +0200| [a16c512374ca8c0661fa02818f075e4ac4c15896] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a16c512374ca8c0661fa02818f075e4ac4c15896
---