[FFmpeg-devel] lavf/movenc: Only write timecode track for mov by default

Submitted by Carl Eugen Hoyos on Sept. 26, 2016, 6:54 a.m.

Details

Message ID 201609260854.41969.cehoyos@ag.or.at
State New
Headers show

Commit Message

Carl Eugen Hoyos Sept. 26, 2016, 6:54 a.m.
Hi!

As requested by Clément, no opinion here.

Please comment, Carl Eugen
From 233aaff6511c3b105a7ac2dad2d55d03455df153 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Mon, 26 Sep 2016 08:52:36 +0200
Subject: [PATCH] lavf/movenc: Only write timecode track for mov by default.

---
 Changelog            |    1 +
 doc/muxers.texi      |    2 +-
 libavformat/movenc.c |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/Changelog b/Changelog
index 4e4b4bf..7e99767 100644
--- a/Changelog
+++ b/Changelog
@@ -35,6 +35,7 @@  version <next>:
 - sdl2 output device
 - sdl2 support for ffplay
 - sdl1 output device and sdl1 support removed
+- Write timecode track only for mov output by default
 
 
 version 3.1:
diff --git a/doc/muxers.texi b/doc/muxers.texi
index c8a056f..87dccf5 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -886,7 +886,7 @@  circumstances (avoiding basing track fragment location calculations
 on the implicit end of the previous track fragment).
 @item -write_tmcd
 Specify @code{on} to force writing a timecode track, @code{off} to disable it
-and @code{auto} to write a timecode track only for mov and mp4 output (default).
+and @code{auto} to write a timecode track only for mov output (default).
 @end table
 
 @subsection Example
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 449d0b5..83840a6 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -5540,7 +5540,7 @@  static int mov_write_header(AVFormatContext *s)
         }
     }
 
-    if (   mov->write_tmcd == -1 && (mov->mode == MODE_MOV || mov->mode == MODE_MP4)
+    if (   mov->write_tmcd == -1 && mov->mode == MODE_MOV
         || mov->write_tmcd == 1) {
         tmcd_track = mov->nb_streams;