virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Revert "matroskadec: forward parsing errors to caller."

Browse Source 
This reverts commit 5dd514af93.
Silently ignoring errors allows some broken files to simply be played, instead of failing.
(cherry picked from commit 7804b0693375c1a7ba1046f7a3579e9f63c2b15a)

The intended goal (as confirmed with its author) of fixing a crash has been
fixed differently prior to the application of this patch and this patch does
notsucessfully propagate parse errors either.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Hendrik Leppkes 2011-07-06 19:57:11 +02:00 committed by Michael Niedermayer
parent c5865a8967
commit 8689d87ac6
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/matroskadec.c
View File

@ -1753,7 +1753,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
if (size <= 3 || !track || !track->stream) { if (size <= 3 || !track || !track->stream) {
av_log(matroska->ctx, AV_LOG_INFO, av_log(matroska->ctx, AV_LOG_INFO,
"Invalid stream %"PRIu64" or size %u\n", num, size); "Invalid stream %"PRIu64" or size %u\n", num, size);
return AVERROR_INVALIDDATA; return res;
} }
st = track->stream; st = track->stream;
if (st->discard >= AVDISCARD_ALL) if (st->discard >= AVDISCARD_ALL)
@ -1990,7 +1990,7 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska)
res = ebml_parse(matroska, matroska_clusters, &cluster); res = ebml_parse(matroska, matroska_clusters, &cluster);
blocks_list = &cluster.blocks; blocks_list = &cluster.blocks;
blocks = blocks_list->elem; blocks = blocks_list->elem;
for (i=0; i<blocks_list->nb_elem && !res; i++) for (i=0; i<blocks_list->nb_elem; i++)
if (blocks[i].bin.size > 0 && blocks[i].bin.data) { if (blocks[i].bin.size > 0 && blocks[i].bin.data) {
int is_keyframe = blocks[i].non_simple ? !blocks[i].reference : -1; int is_keyframe = blocks[i].non_simple ? !blocks[i].reference : -1;
res=matroska_parse_block(matroska, res=matroska_parse_block(matroska,
@ -2007,15 +2007,14 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska)
static int matroska_read_packet(AVFormatContext *s, AVPacket *pkt) static int matroska_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
MatroskaDemuxContext *matroska = s->priv_data; MatroskaDemuxContext *matroska = s->priv_data;
int ret = 0;
while (!ret && matroska_deliver_packet(matroska, pkt)) { while (matroska_deliver_packet(matroska, pkt)) {
if (matroska->done) if (matroska->done)
return AVERROR_EOF; return AVERROR_EOF;
ret = matroska_parse_cluster(matroska); matroska_parse_cluster(matroska);
} }
return ret; return 0;
} }
static int matroska_read_seek(AVFormatContext *s, int stream_index, static int matroska_read_seek(AVFormatContext *s, int stream_index,