avienc: Disallow the first frame to be skiped
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 May 2013 16:58:39 +0000 (18:58 +0200)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Tue, 28 May 2013 07:36:01 +0000 (09:36 +0200)
Fixes Ticket2386

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cc0db8cf3042186d8355dcf10be67071cfbbcc5d)

Conflicts:
libavformat/avienc.c

libavformat/avienc.c

index a4795e9..5c15e7c 100644 (file)
@@ -524,7 +524,7 @@ static int avi_write_packet(AVFormatContext *s, AVPacket *pkt)
     int size= pkt->size;
 
 //    av_log(s, AV_LOG_DEBUG, "%"PRId64" %d %d\n", pkt->dts, avist->packet_count, stream_index);
-    while(enc->block_align==0 && pkt->dts != AV_NOPTS_VALUE && pkt->dts > avist->packet_count && enc->codec_id != CODEC_ID_XSUB){
+    while(enc->block_align==0 && pkt->dts != AV_NOPTS_VALUE && pkt->dts > avist->packet_count && enc->codec_id != CODEC_ID_XSUB && avist->packet_count){
         AVPacket empty_packet;
 
         if(pkt->dts - avist->packet_count > 60000){