diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-30 22:05:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-30 22:18:43 +0200 |
| commit | 39de8343f9274f3c93bf44ecb7dcd832b648365d (patch) | |
| tree | edea96a08f325f56b762b7f6ea103d16b2d8cd95 /libavformat | |
| parent | 79e5902cf163dcb8b6539618936ff0ce28f742e4 (diff) | |
| parent | 0ca4642ec520e315692c4a8b8a98ab390bddfad2 (diff) | |
| download | ffmpeg-39de8343f9274f3c93bf44ecb7dcd832b648365d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mkv: mark corrupted packets and return them
mkv: forward EMBL block data error
avcodec: introduce YCoCg colorspace
avcodec: cosmetic cleanup on header
aac sbr: align struct member by 32 byte.
Conflicts:
libavcodec/avcodec.h
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskadec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 355bcbb08c..e8f70f96c1 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1849,7 +1849,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, if ((n = matroska_ebmlnum_uint(matroska, data, size, &num)) < 0) { av_log(matroska->ctx, AV_LOG_ERROR, "EBML block data error\n"); - return AVERROR_INVALIDDATA; + return n; } data += n; size -= n; |