summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-12-16 03:11:36 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-12-16 03:11:36 +0000
commit09a76db8e646a1ab5232b5cc178acc2b1ee19218 (patch)
tree56bb971a80e4dcac977268bef2baced7929a1a7e
parent2169b79c2a95d4e90aaaf5a1c745a5d981789e92 (diff)
downloadffmpeg-streaming-09a76db8e646a1ab5232b5cc178acc2b1ee19218.zip
ffmpeg-streaming-09a76db8e646a1ab5232b5cc178acc2b1ee19218.tar.gz
Do not skip frames until the first keyframe when stream copying but
no starttime is set. Fixes at least -vcodec copy with VS2k5DebugDemo-01-partial.avi. Originally committed as revision 16159 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index a6f66c7..a4765f5 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1353,7 +1353,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
AVPacket opkt;
av_init_packet(&opkt);
- if (!ost->frame_number && !(pkt->flags & PKT_FLAG_KEY))
+ if ((!ost->frame_number && !(pkt->flags & PKT_FLAG_KEY)) && start_time)
continue;
/* no reencoding needed : output the packet directly */
OpenPOWER on IntegriCloud