generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'f963f701d90bd7bb03e39aab4e59bd137084e082'

Browse Source 
* commit 'f963f701d90bd7bb03e39aab4e59bd137084e082':
  ogg: relax demuxer conformance checks

Conflicts:
	libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-06-23 13:21:21 +02:00
commit 780b1aa1ef
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/oggdec.c
View File

@ -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); av_log(s, AV_LOG_ERROR, "Header parsing failed for stream %d\n", i);
ogg->streams[i].codec = NULL; ogg->streams[i].codec = NULL;
} else if (os->codec && os->nb_header < os->codec->nb_header) { } 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) if (os->start_granule != OGG_NOGRANULE_VALUE)
os->lastpts = s->streams[i]->start_time = os->lastpts = s->streams[i]->start_time =