[FFmpeg-cvslog] avformat/asfenc: dont allow non interleaved packets

Michael Niedermayer git at videolan.org
Wed Apr 23 17:26:46 CEST 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 02:39:00 2014 +0200| [e9e42beed2acc876498737272112e89a3605e104] | committer: Carl Eugen Hoyos

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 at gmx.at>
(cherry picked from commit 369cdf917aaa5d7fbc61d57f87e638772e806716)
(cherry picked from commit 514ec9bece86fed440ac829c10e82c4a0569c3a5)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e9e42beed2acc876498737272112e89a3605e104
---

 libavformat/asfenc.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c
index b456730..8f72977 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);



More information about the ffmpeg-cvslog mailing list