diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-01-20 13:59:06 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-02-04 11:17:06 +0100 |
| commit | 33c859c142ef3f49b7a6227014ad92a680cf4d74 (patch) | |
| tree | c62a16cb8ed9b9645989605675eb4c810777a303 /libavformat/mux.c | |
| parent | 7b03b65bf0d02519c86750d2da33f413e11cf0c6 (diff) | |
| download | ffmpeg-33c859c142ef3f49b7a6227014ad92a680cf4d74.tar.gz | |
lavf: ignore attachment streams for interleaving purposes
Those streams should never get any packets by definition.
Diffstat (limited to 'libavformat/mux.c')
| -rw-r--r-- | libavformat/mux.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index 24c4932ed7..06dacead8f 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -232,6 +232,9 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options) av_log(s, AV_LOG_WARNING, "Codec for stream %d does not use global headers " "but container format requires global headers\n", i); + + if (codec->codec_type != AVMEDIA_TYPE_ATTACHMENT) + s->internal->nb_interleaved_streams++; } if (!s->priv_data && of->priv_data_size > 0) { @@ -541,7 +544,7 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, for (i = 0; i < s->nb_streams; i++) stream_count += !!s->streams[i]->last_in_packet_buffer; - if (stream_count && (s->nb_streams == stream_count || flush)) { + if (stream_count && (s->internal->nb_interleaved_streams == stream_count || flush)) { pktl = s->packet_buffer; *out = pktl->pkt; |