diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-23 13:21:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-23 13:21:21 +0200 |
| commit | 780b1aa1efa872ec7401735764795134427db1ab (patch) | |
| tree | 5499815afacb4c31b2d5611c1d712110c92fc4e7 /libavformat | |
| parent | cc61ef0479f07ddb9f22cbf3fa9ca28d6fd0cf72 (diff) | |
| parent | f963f701d90bd7bb03e39aab4e59bd137084e082 (diff) | |
Merge commit 'f963f701d90bd7bb03e39aab4e59bd137084e082'
* commit 'f963f701d90bd7bb03e39aab4e59bd137084e082':
ogg: relax demuxer conformance checks
Conflicts:
libavformat/oggdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/oggdec.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index fd954b805b..ad966e39d1 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -671,7 +671,12 @@ static int ogg_read_header(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "Header parsing failed for stream %d\n", i); ogg->streams[i].codec = NULL; } else if (os->codec && os->nb_header < os->codec->nb_header) { - av_log(s, AV_LOG_WARNING, "Number of headers (%d) mismatch for stream %d\n", os->nb_header, i); + av_log(s, AV_LOG_WARNING, + "Headers mismatch for stream %d: " + "expected %d received %d.\n", + i, os->codec->nb_header, os->nb_header); + if (s->error_recognition & AV_EF_EXPLODE) + return AVERROR_INVALIDDATA; } if (os->start_granule != OGG_NOGRANULE_VALUE) os->lastpts = s->streams[i]->start_time = |