[FFmpeg-cvslog] avienc: Disallow the first frame to be skiped

Michael Niedermayer git at videolan.org
Tue May 28 09:40:59 CEST 2013


ffmpeg | branch: release/0.11 | Michael Niedermayer <michaelni at gmx.at> | Mon May 20 18:58:39 2013 +0200| [ba445be96fa832da8f8b4886a3183a964b290bf9] | committer: Carl Eugen Hoyos

avienc: Disallow the first frame to be skiped

Fixes Ticket2386

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

Conflicts:
	libavformat/avienc.c

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

 libavformat/avienc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index a4795e9..5c15e7c 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -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){



More information about the ffmpeg-cvslog mailing list