From patchwork Fri Nov 23 18:03:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 11131 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 4CFD744DC6B for ; Fri, 23 Nov 2018 20:04:04 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BB25068A125; Fri, 23 Nov 2018 20:04:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f196.google.com (mail-it1-f196.google.com [209.85.166.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A5AED689F29 for ; Fri, 23 Nov 2018 20:03:57 +0200 (EET) Received: by mail-it1-f196.google.com with SMTP id o19so19455098itg.5 for ; Fri, 23 Nov 2018 10:04:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=MPlpuPWjr2w1YYQ25G1kXRBkG4DaFfVfSBc4hhsAlwc=; b=ao5jIe4Bn8i09Xg6nji1pYkF04IJ4lH47uS16Sv2VK192P1VrorEMDXLKKtbYuBhnp Wq9QUuY4zvNxwhRS8DF3UnzRfOpiEiOhtf/q3EruDD86e0JJ2Y9FqNhHcOIwRJgemiCH 8g0IGSoWFbPqZI6EiTSKc9adMYGivLFqPApBgpgA1qd2VHk+JIUrTTwnjM3F9HWma40p BOwm5aMyMWYHqSyFwV8AahQV0+qYMMGJAcv7zRG7s+s1oeyiI+dTksPzbNBOXnUZjwL5 L5mBMiqP5F1hC2LI11OESPXulSszmA0Xv7wbo0najaogDOp7PZQSwYIgCgqPuNeJuMAB kHsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=MPlpuPWjr2w1YYQ25G1kXRBkG4DaFfVfSBc4hhsAlwc=; b=shlYrA18LLNsdyLrLbtkPEbg8m/G7gyrMEXTQM4QPNQfaJiUgE6reuKY0AbeSQaR3M qCuF/v9XywIhWNXsv72pJAtIs3ROdtsaekK0O2BQzOvswbKwTncaJiujnzuXTotASD5E XO/oSjbxvGpACiIU8bDcylh2RFGL/vgE4Lmj2MkHP4xuWJ4flhReQ1iAipkmwRxqm8Jx hLpmH+f81EdLTMycVxUVN9tPTKQqvdxE4OdJz3Zifepw98dHKM5wWF8d/15tQX6Qjjop z/HAENqdTjCmAti3VIRkaEcjsc+E8lRP964FfZ+Ps2KFmxHLFN3m4mcWDFcmwnIl55cx jwiw== X-Gm-Message-State: AA+aEWZhyj8zLNoF2ZOz6AEbs5fe4cmFkoRiNqSCHavpUkQrtq8w2FS9 XwHu7FG+ENj6bJ9l8LUlnHDd51Pn7jXKNSRVAZP22Q== X-Google-Smtp-Source: AFSGD/UUPaMPzYyGbYOId/Ylch5S2aoFm0vC7c1NeokunLBytM3JdjhEiWFdDNp/x0vPFOdN8RrZg7kReSbtBf1+qY4= X-Received: by 2002:a24:e4ca:: with SMTP id o193mr14329770ith.149.1542996239678; Fri, 23 Nov 2018 10:03:59 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a02:5f11:0:0:0:0:0 with HTTP; Fri, 23 Nov 2018 10:03:58 -0800 (PST) From: Carl Eugen Hoyos Date: Fri, 23 Nov 2018 19:03:58 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]Avoid duplicating Closed Captions when increasing frame rate 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! Attached patches fix Closed Captions when increasing frame rate, both with "-r" and the fps filter, fixes ticket #7506. Please comment, Carl Eugen From 86ddd7f86991bdfe865f4180f8bf5779383f5295 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Fri, 23 Nov 2018 18:49:27 +0100 Subject: [PATCH 2/2] ffmpeg: Avoid duplicating Closed Captions when increasing frame rate. Fixes ticket #7506. --- fftools/ffmpeg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index a12208c..6ce1156 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1286,6 +1286,8 @@ static void do_video_out(OutputFile *of, ret = avcodec_send_frame(enc, in_picture); if (ret < 0) goto error; + // Make sure Closed Captions will not be duplicated + av_frame_remove_side_data(in_picture, AV_FRAME_DATA_A53_CC); while (1) { ret = avcodec_receive_packet(enc, &pkt); -- 1.7.10.4