summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorWolfram Gloger <wmglo@dent.med.uni-muenchen.de>2008-12-22 08:22:22 +0000
committerBenoit Fouet <benoit.fouet@free.fr>2008-12-22 08:22:22 +0000
commit50e3477f0f2aabcc4a192af39c4a4f87da66bb85 (patch)
tree7345ad4d9d469f24ade3a10639853591261e9466 /ffmpeg.c
parent108c96d5e702e851d7c5310b0e699cba0e5c70db (diff)
downloadffmpeg-50e3477f0f2aabcc4a192af39c4a4f87da66bb85.tar.gz
Offer an option (disabled by default) to enable the copy of the frames before
the first key frame in a stream. Patch by Wolfram Gloger wmglo /!\ dent med uni (minus) muenchen de Originally committed as revision 16269 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index a4765f5bee..9ca3b01a62 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -196,6 +196,7 @@ static int video_global_header = 0;
static char *vstats_filename;
static FILE *vstats_file;
static int opt_programid = 0;
+static int copy_initial_nonkeyframes = 0;
static int rate_emu = 0;
@@ -1353,7 +1354,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)) && start_time)
+ if ((!ost->frame_number && !(pkt->flags & PKT_FLAG_KEY)) && !copy_initial_nonkeyframes)
continue;
/* no reencoding needed : output the packet directly */
@@ -3767,6 +3768,7 @@ static const OptionDef options[] = {
{ "dts_delta_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT, {(void*)&dts_delta_threshold}, "timestamp discontinuity delta threshold", "threshold" },
{ "programid", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&opt_programid}, "desired program number", "" },
{ "xerror", OPT_BOOL, {(void*)&exit_on_error}, "exit on error", "error" },
+ { "copyinkf", OPT_BOOL | OPT_EXPERT, {(void*)&copy_initial_nonkeyframes}, "copy initial non-keyframes" },
/* video options */
{ "b", OPT_FUNC2 | HAS_ARG | OPT_VIDEO, {(void*)opt_bitrate}, "set bitrate (in bits/s)", "bitrate" },