From patchwork Mon Sep 26 06:54:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 723 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1759786vsd; Sun, 25 Sep 2016 23:54:53 -0700 (PDT) X-Received: by 10.194.238.42 with SMTP id vh10mr16415848wjc.111.1474872893542; Sun, 25 Sep 2016 23:54:53 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z8si7270164wmz.69.2016.09.25.23.54.52; Sun, 25 Sep 2016 23:54:53 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 83C24689E2D; Mon, 26 Sep 2016 09:54:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-3.mx.upcmail.net (vie01a-dmta-pe01-3.mx.upcmail.net [62.179.121.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49A5B689BB5 for ; Mon, 26 Sep 2016 09:54:27 +0300 (EEST) Received: from [172.31.216.44] (helo=vie01a-pemc-psmtp-pe02) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1boPoJ-0003X0-Eh for ffmpeg-devel@ffmpeg.org; Mon, 26 Sep 2016 08:54:43 +0200 Received: from [192.168.1.3] ([80.110.111.220]) by vie01a-pemc-psmtp-pe02 with SMTP @ mailcloud.upcmail.net id o6ui1t0024lMiqw016ujkQ; Mon, 26 Sep 2016 08:54:43 +0200 X-SourceIP: 80.110.111.220 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Mon, 26 Sep 2016 08:54:41 +0200 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201609260854.41969.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavf/movenc: Only write timecode track for mov by default X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 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(-) diff --git a/Changelog b/Changelog index 4e4b4bf..7e99767 100644 --- a/Changelog +++ b/Changelog @@ -35,6 +35,7 @@ version : - 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;