diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-20 13:40:47 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-20 13:40:47 +0200 |
commit | a16c512374ca8c0661fa02818f075e4ac4c15896 (patch) | |
tree | 86e73958de007cfa7d0172ea864fb82ac17c4698 /tests/ref/fate/vsynth2-mpeg2-422 | |
parent | 1df2e3c707d394ae28159400374ead8d7230f443 (diff) | |
parent | c9a39cec70603f662f4c326b21b11c4f0112079a (diff) | |
download | ffmpeg-a16c512374ca8c0661fa02818f075e4ac4c15896.tar.gz |
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>
Diffstat (limited to 'tests/ref/fate/vsynth2-mpeg2-422')
0 files changed, 0 insertions, 0 deletions