diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-15 23:10:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-15 23:10:26 +0200 |
| commit | 62101030c4ff23c61046a70cd27a627dfb0e0e54 (patch) | |
| tree | 8837cb836ad73deea83be440cc8d315ba2f601ce /libavformat | |
| parent | e78d1a594a0a4942b2c39170df10b9f36f9b8d08 (diff) | |
| parent | ea540401d6082474df8364169e2041e29e4dc407 (diff) | |
| download | ffmpeg-62101030c4ff23c61046a70cd27a627dfb0e0e54.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: fix byte overreads in SSE-optimized hscale().
matroskadec: fix typo.
matroskadec: bail on parsing of incorrect seek index segments
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskadec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 9cf3e956fc..43eb58f46a 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1191,7 +1191,7 @@ static int matroska_parse_seekhead_entry(MatroskaDemuxContext *matroska, int idx matroska->num_levels++; matroska->current_id = 0; - ebml_parse(matroska, matroska_segment, matroska); + ret = ebml_parse(matroska, matroska_segment, matroska); /* remove dummy level */ while (matroska->num_levels) { @@ -1383,7 +1383,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) } if (encodings_list->nb_elem > 1) { av_log(matroska->ctx, AV_LOG_ERROR, - "Multiple combined encodings no supported"); + "Multiple combined encodings not supported"); } else if (encodings_list->nb_elem == 1) { if (encodings[0].type || (encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP && |