aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-11 05:24:26 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-11 05:24:26 +0200
commit0c0ec4be6bfabd766ea4125329c127b4ceb2ab1e (patch)
treef110c12bfb7a3a6d35b44ecc3f7dcc2b22a9bc6a /ffmpeg.c
parent23f5cff92cdcfa55a735c458fcb5f95c0e0f3b1f (diff)
downloadffmpeg-0c0ec4be6bfabd766ea4125329c127b4ceb2ab1e.tar.gz
ffmpeg: dont copy duration when -t is used
Fixes Ticket445 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 9565c70877..048d2fabe1 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3834,9 +3834,12 @@ static void opt_output_file(void *optctx, const char *filename)
}
/* copy global metadata by default */
- if (!o->metadata_global_manual && nb_input_files)
+ if (!o->metadata_global_manual && nb_input_files){
av_dict_copy(&oc->metadata, input_files[0].ctx->metadata,
AV_DICT_DONT_OVERWRITE);
+ if(o->recording_time != INT64_MAX)
+ av_dict_set(&oc->metadata, "duration", NULL, 0);
+ }
if (!o->metadata_streams_manual)
for (i = output_files[nb_output_files - 1].ost_index; i < nb_output_streams; i++) {
InputStream *ist = &input_streams[output_streams[i].source_index];