eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-05 14:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

avformat/mccenc: use Lavf version string instead of FFmpeg

Browse Source 
The muxed subtitle is created by libavformat, and as such that's what should be
reported. This is in line with the string we write for every other muxer.
After this change, the muxer will no longer be recompiled every time a commit
is made.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2025-10-06 10:32:15 -03:00
parent 6231fa7fb7
commit 660983b7f3
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/mccenc.c
View File

@@ -23,6 +23,7 @@
#include "avformat.h"
#include "internal.h"
#include "mux.h"
#include "version.h"
#include "libavcodec/codec_id.h"
#include "libavcodec/smpte_436m.h"
@@ -30,7 +31,6 @@
#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
#include "libavutil/error.h"
#include "libavutil/ffversion.h"
#include "libavutil/log.h"
#include "libavutil/macros.h"
#include "libavutil/opt.h"
@@ -125,9 +125,9 @@ static int mcc_write_header(AVFormatContext *avf)
const char *creation_program = mcc->creation_program;
if (!creation_program) {
if (avf->flags & AVFMT_FLAG_BITEXACT)
creation_program = "FFmpeg";
creation_program = "Lavf";
else
creation_program = "FFmpeg version " FFMPEG_VERSION;
creation_program = LIBAVFORMAT_IDENT;
} else if (strchr(creation_program, '\n')) {
av_log(avf, AV_LOG_FATAL, "creation_program must not contain multiple lines of text\n");
return AVERROR(EINVAL);

2
tests/fate/subtitles.mak
View File

@@ -133,7 +133,7 @@ fate-sub-rcwt: REF = d86f179094a5752d68aa97d82cf887b0
FATE_SUBTITLES-$(call ALLYES, AVDEVICE LAVFI_INDEV MOVIE_FILTER MPEGTS_DEMUXER MCC_MUXER EIA608_TO_SMPTE436M_BSF) += fate-sub-mcc
fate-sub-mcc: CMD = md5 -f lavfi -i "movie=$(TARGET_SAMPLES)/sub/scte20.ts[out0+subcc]" -map 0:s -c copy -override_time_code_rate ntsc -creation_time "1970-01-02T00:00:00" -bitexact -f mcc
fate-sub-mcc: CMP = oneline
fate-sub-mcc: REF = 779ca7759324441febd6aa6039f29308
fate-sub-mcc: REF = 73982c4db86f3a809c1e8262d3701fc2
FATE_SUBTITLES-$(call DEMMUX, MCC, MCC, SMPTE436M_TO_EIA608_BSF EIA608_TO_SMPTE436M_BSF) += fate-sub-mcc-remux-eia608-bsf
fate-sub-mcc-remux-eia608-bsf: CMD = fmtstdout mcc -f mcc -i $(SRC_PATH)/tests/ref/fate/sub-mcc-remux -map 0:s -c copy -bsf "eia608_to_smpte436m=cdp_frame_rate=60000/1001:initial_cdp_sequence_cntr=65535:line_number=11" -override_time_code_rate ntsc -creation_time "1970-01-02T00:00:00"

2
tests/ref/fate/sub-mcc-remux
View File

@@ -37,7 +37,7 @@ File Format=MacCaption_MCC V2.0
///////////////////////////////////////////////////////////////////////////////////
UUID=0087C4F6-A6B4-5469-8C8E-BBF44950401D
Creation Program=FFmpeg
Creation Program=Lavf
Creation Date=Friday, January 2, 1970
Creation Time=00:00:00
Time Code Rate=30DF

2
tests/ref/fate/sub-mcc-remux-eia608
View File

@@ -37,7 +37,7 @@ File Format=MacCaption_MCC V2.0
///////////////////////////////////////////////////////////////////////////////////
UUID=0087C4F6-A6B4-5469-8C8E-BBF44950401D
Creation Program=FFmpeg
Creation Program=Lavf
Creation Date=Friday, January 2, 1970
Creation Time=00:00:00
Time Code Rate=30DF

2
tests/ref/fate/sub-mcc-remux-eia608-bsf
View File

@@ -37,7 +37,7 @@ File Format=MacCaption_MCC V2.0
///////////////////////////////////////////////////////////////////////////////////
UUID=0087C4F6-A6B4-5469-8C8E-BBF44950401D
Creation Program=FFmpeg
Creation Program=Lavf
Creation Date=Friday, January 2, 1970
Creation Time=00:00:00
Time Code Rate=30DF

2
tests/ref/fate/sub-mcc-remux-eia608-recode
View File

@@ -37,7 +37,7 @@ File Format=MacCaption_MCC V2.0
///////////////////////////////////////////////////////////////////////////////////
UUID=0087C4F6-A6B4-5469-8C8E-BBF44950401D
Creation Program=FFmpeg
Creation Program=Lavf
Creation Date=Friday, January 2, 1970
Creation Time=00:00:00
Time Code Rate=30DF