break;
case MKTAG('s', 't', 'r', 'f'):
/* stream header */
- if (!size)
+ if (!size && (codec_type == AVMEDIA_TYPE_AUDIO ||
+ codec_type == AVMEDIA_TYPE_VIDEO))
break;
if (stream_index >= (unsigned)s->nb_streams || avi->dv_demux) {
avio_skip(pb, size);
if (!sub_demuxer)
goto error;
+ if (strcmp(sub_demuxer->name, "srt") && strcmp(sub_demuxer->name, "ass"))
+ goto error;
+
if (!(ast->sub_ctx = avformat_alloc_context()))
goto error;
error:
av_freep(&ast->sub_ctx);
- av_freep(&pb);
+ avio_context_free(&pb);
}
return 0;
}
}
}
- if (!avi->dv_demux &&
- ((st->discard >= AVDISCARD_DEFAULT && size == 0) /* ||
- // FIXME: needs a little reordering
- (st->discard >= AVDISCARD_NONKEY &&
- !(pkt->flags & AV_PKT_FLAG_KEY)) */
- || st->discard >= AVDISCARD_ALL)) {
- if (!exit_early) {
- ast->frame_offset += get_duration(ast, size);
- avio_skip(pb, size);
- goto start_sync;
- }
- }
-
if (d[2] == 'p' && d[3] == 'c' && size <= 4 * 256 + 4) {
int k = avio_r8(pb);
int last = (k + avio_r8(pb) - 1) & 0xFF;
ast->prefix_count = 0;
}
+ if (!avi->dv_demux &&
+ ((st->discard >= AVDISCARD_DEFAULT && size == 0) /* ||
+ // FIXME: needs a little reordering
+ (st->discard >= AVDISCARD_NONKEY &&
+ !(pkt->flags & AV_PKT_FLAG_KEY)) */
+ || st->discard >= AVDISCARD_ALL)) {
+
+ ast->frame_offset += get_duration(ast, size);
+ avio_skip(pb, size);
+ goto start_sync;
+ }
+
avi->stream_index = n;
ast->packet_size = size + 8;
ast->remaining = size;