summaryrefslogtreecommitdiff
path: root/avconv.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2012-01-23 13:06:07 +0200
committerMartin Storsjö <martin@martin.st>2012-02-14 16:12:15 +0200
commitae5a9355744f048e14c9242142f78f7023fa357f (patch)
tree7914ac84e1663694de3474db13a1f41b1a2dd789 /avconv.c
parent2bd730010da24d035639586bb13862abe36cc1b8 (diff)
downloadffmpeg-ae5a9355744f048e14c9242142f78f7023fa357f.tar.gz
avconv: Don't split out inline sequence headers when stream copying VC1
This is required when stream copying VC1 in ismv - there's one global header in the moov atom, but keyframes have a separate sequence header prepended. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/avconv.c b/avconv.c
index 92ffd0fd0d..862e325ad9 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1795,6 +1795,7 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
if ( ost->st->codec->codec_id != CODEC_ID_H264
&& ost->st->codec->codec_id != CODEC_ID_MPEG1VIDEO
&& ost->st->codec->codec_id != CODEC_ID_MPEG2VIDEO
+ && ost->st->codec->codec_id != CODEC_ID_VC1
) {
if (av_parser_change(ist->st->parser, ost->st->codec, &opkt.data, &opkt.size, pkt->data, pkt->size, pkt->flags & AV_PKT_FLAG_KEY))
opkt.destruct = av_destruct_packet;