Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-21 04:39:00 +0400
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-04-23 19:10:26 +0400
commite9e42beed2acc876498737272112e89a3605e104 (patch)
tree410467d6042608f89ec64c21a933760abdfa6334 /libavformat
parentabd6decd554dbccb6eacb23e2cc78acc72202d2d (diff)
avformat/asfenc: dont allow non interleaved packets
The muxer does not support this currently Fixes ticket #3547. Fixes ticket #3555. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 369cdf917aaa5d7fbc61d57f87e638772e806716) (cherry picked from commit 514ec9bece86fed440ac829c10e82c4a0569c3a5)
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/asfenc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c
index b456730229..8f7297734d 100644
--- a/libavformat/asfenc.c
+++ b/libavformat/asfenc.c
@@ -611,6 +611,7 @@ static int asf_write_header(AVFormatContext *s)
ASFContext *asf = s->priv_data;
s->packet_size = PACKET_SIZE;
+ s->max_interleave_delta = 0;
asf->nb_packets = 0;
asf->index_ptr = av_malloc(sizeof(ASFIndex) * ASF_INDEX_BLOCK);