]> git.sesse.net Git - ffmpeg/commitdiff
lavfi/fps: Avoid duplicating Closed Captions when increasing frame rate.
authorCarl Eugen Hoyos <ceffmpeg@gmail.com>
Fri, 23 Nov 2018 17:48:50 +0000 (18:48 +0100)
committerCarl Eugen Hoyos <ceffmpeg@gmail.com>
Tue, 27 Nov 2018 17:38:03 +0000 (18:38 +0100)
libavfilter/version.h
libavfilter/vf_fps.c

index 76b212305ab1dcf2fb86d06837ee7ab116278d9c..c6b4d981c9447fd30417b0491994fb11e0a7a78c 100644 (file)
@@ -31,7 +31,7 @@
 
 #define LIBAVFILTER_VERSION_MAJOR   7
 #define LIBAVFILTER_VERSION_MINOR  46
-#define LIBAVFILTER_VERSION_MICRO 100
+#define LIBAVFILTER_VERSION_MICRO 101
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \
index 9167a00a13ccb7191534b43fb6987cfac21592e1..6b99f20d2bb367ac3593138fd0bd770d79ba3b36 100644 (file)
@@ -249,6 +249,8 @@ static int write_frame(AVFilterContext *ctx, FPSContext *s, AVFilterLink *outlin
         frame = av_frame_clone(s->frames[0]);
         if (!frame)
             return AVERROR(ENOMEM);
+        // Make sure Closed Captions will not be duplicated
+        av_frame_remove_side_data(s->frames[0], AV_FRAME_DATA_A53_CC);
         frame->pts = s->next_pts++;
 
         av_log(ctx, AV_LOG_DEBUG, "Writing frame with pts %"PRId64" to pts %"PRId64"\n",