[FFmpeg-cvslog] Fix issue2619.

Michael Niedermayer git
Sat Feb 19 17:40:05 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 19 17:30:04 2011 +0100| [5c20c81bfa526b3a269db9c88b0c9007861f0917] | committer: Michael Niedermayer

Fix issue2619.
regression introduced in 1762d9ced70ccc46c5d3e5d64e56a48d0fbbd4f7

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 ffmpeg.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 300bb5e..38aebe4 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1698,7 +1698,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
                         av_init_packet(&opkt);
 
                         if ((!ost->frame_number && !(pkt->flags & AV_PKT_FLAG_KEY)) && !copy_initial_nonkeyframes)
-                            continue;
+                            goto cont;
 
                         /* no reencoding needed : output the packet directly */
                         /* force the input stream PTS */
@@ -1746,6 +1746,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
                         ost->frame_number++;
                         av_free_packet(&opkt);
                     }
+                    cont:
 #if CONFIG_AVFILTER
                     frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) &&
                                        ost->output_video_filter && avfilter_poll_frame(ost->output_video_filter->inputs[0]);




More information about the ffmpeg-cvslog mailing list