diff options
| author | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2018-11-23 18:48:50 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2018-11-27 18:38:03 +0100 |
| commit | 1893c72086024e53ac32312ecb96693c5be023d0 (patch) | |
| tree | 9c6cf2baf17e2f903880d36be2a5039c74d9cef9 | |
| parent | 28c96c2ce2781c2cd147a9f3c299e18ce1dc7ff8 (diff) | |
| download | ffmpeg-1893c72086024e53ac32312ecb96693c5be023d0.tar.gz | |
lavfi/fps: Avoid duplicating Closed Captions when increasing frame rate.
| -rw-r--r-- | libavfilter/version.h | 2 | ||||
| -rw-r--r-- | libavfilter/vf_fps.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h index 76b212305a..c6b4d981c9 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -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, \ diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c index 9167a00a13..6b99f20d2b 100644 --- a/libavfilter/vf_fps.c +++ b/libavfilter/vf_fps.c @@ -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", |