[FFmpeg-cvslog] aarch64: Factorize code for CPU feature detection on Apple platforms
ffmpeg | branch: master | Martin Storsjö | Tue Mar 12
10:23:15 2024 +0200| [8339a45400458ab91f973ef671cbf99e38284e7e] | committer:
Martin Storsjö
aarch64: Factorize code for CPU feature detection on Apple platforms
Signed-off-by: Martin Storsjö
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8339a45400458ab91f973ef671cbf99e38284e7e
---
libavutil/aarch64/cpu.c | 25 +
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/libavutil/aarch64/cpu.c b/libavutil/aarch64/cpu.c
index 7a05391343..196bdaf6b0 100644
--- a/libavutil/aarch64/cpu.c
+++ b/libavutil/aarch64/cpu.c
@@ -45,22 +45,23 @@ static int detect_flags(void)
#elif defined(__APPLE__) && HAVE_SYSCTLBYNAME
#include
+static int have_feature(const char *feature) {
+uint32_t value = 0;
+size_t size = sizeof(value);
+if (!sysctlbyname(feature, &value, &size, NULL, 0))
+return value;
+return 0;
+}
+
static int detect_flags(void)
{
-uint32_t value = 0;
-size_t size;
int flags = 0;
-size = sizeof(value);
-if (!sysctlbyname("hw.optional.arm.FEAT_DotProd", &value, &size, NULL, 0))
{
-if (value)
-flags |= AV_CPU_FLAG_DOTPROD;
-}
-size = sizeof(value);
-if (!sysctlbyname("hw.optional.arm.FEAT_I8MM", &value, &size, NULL, 0)) {
-if (value)
-flags |= AV_CPU_FLAG_I8MM;
-}
+if (have_feature("hw.optional.arm.FEAT_DotProd"))
+flags |= AV_CPU_FLAG_DOTPROD;
+if (have_feature("hw.optional.arm.FEAT_I8MM"))
+flags |= AV_CPU_FLAG_I8MM;
+
return flags;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] movenc: Remove a leftover commented out line
ffmpeg | branch: master | Martin Storsjö | Thu Apr 4
13:27:52 2024 +0300| [e4e3d25d41ec757639bedc4fe7c05775dd5b0b32] | committer:
Martin Storsjö
movenc: Remove a leftover commented out line
This line originates from 6f69f7a8bf6a0d013985578df2ef42ee6b1c7994.
Signed-off-by: Martin Storsjö
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4e3d25d41ec757639bedc4fe7c05775dd5b0b32
---
libavformat/movenc.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 15b65dcf96..f382c4fdf3 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1175,8 +1175,6 @@ static int get_samples_per_packet(MOVTrack *track)
{
int i, first_duration;
-// return track->par->frame_size;
-
/* use 1 for raw PCM */
if (!track->audio_vbr)
return 1;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] movenc: Allow writing timed ID3 metadata
ffmpeg | branch: master | Martin Storsjö | Wed Jan 17
17:12:55 2024 +0200| [fbd5e238d441df8b5e2c1d466e75dd714d7eef25] | committer:
Martin Storsjö
movenc: Allow writing timed ID3 metadata
This is based on a spec at https://aomediacodec.github.io/id3-emsg/,
further based on ISO/IEC 23009-1:2019.
Within libavformat, timed ID3 metadata (already supported by the
mpegts demuxer and muxer) is handled as a separate data AVStream
with codec type AV_CODEC_ID_TIMED_ID3. However, it doesn't
have a corresponding track in the mov file - instead, these events
are written as separate toplevel 'emsg' boxes.
Signed-off-by: Martin Storsjö
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fbd5e238d441df8b5e2c1d466e75dd714d7eef25
---
libavformat/movenc.c | 49 -
libavformat/tests/movenc.c | 55 --
tests/ref/fate/movenc | 8 +++
3 files changed, 104 insertions(+), 8 deletions(-)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index f382c4fdf3..6ede5119f0 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -5519,7 +5519,7 @@ static int mov_write_ftyp_tag(AVIOContext *pb,
AVFormatContext *s)
{
MOVMuxContext *mov = s->priv_data;
int64_t pos = avio_tell(pb);
-int has_h264 = 0, has_av1 = 0, has_video = 0, has_dolby = 0;
+int has_h264 = 0, has_av1 = 0, has_video = 0, has_dolby = 0, has_id3 = 0;
int has_iamf = 0;
#if CONFIG_IAMFENC
@@ -5550,6 +5550,8 @@ static int mov_write_ftyp_tag(AVIOContext *pb,
AVFormatContext *s)
st->codecpar->nb_coded_side_data,
AV_PKT_DATA_DOVI_CONF))
has_dolby = 1;
+if (st->codecpar->codec_id == AV_CODEC_ID_TIMED_ID3)
+has_id3 = 1;
}
avio_wb32(pb, 0); /* size */
@@ -5629,6 +5631,9 @@ static int mov_write_ftyp_tag(AVIOContext *pb,
AVFormatContext *s)
if (mov->flags & FF_MOV_FLAG_DASH && mov->flags & FF_MOV_FLAG_GLOBAL_SIDX)
ffio_wfourcc(pb, "dash");
+if (has_id3)
+ffio_wfourcc(pb, "aid3");
+
return update_size(pb, pos);
}
@@ -6712,6 +6717,34 @@ static int mov_build_iamf_packet(AVFormatContext *s,
MOVTrack *trk, AVPacket *pk
}
#endif
+static int mov_write_emsg_tag(AVIOContext *pb, AVStream *st, AVPacket *pkt)
+{
+int64_t pos = avio_tell(pb);
+const char *scheme_id_uri = "https://aomedia.org/emsg/ID3";;
+const char *value = "";
+
+av_assert0(st->time_base.num == 1);
+
+avio_write_marker(pb,
+ av_rescale_q(pkt->pts, st->time_base, AV_TIME_BASE_Q),
+ AVIO_DATA_MARKER_BOUNDARY_POINT);
+
+avio_wb32(pb, 0); /* size */
+ffio_wfourcc(pb, "emsg");
+avio_w8(pb, 1); /* version */
+avio_wb24(pb, 0);
+avio_wb32(pb, st->time_base.den); /* timescale */
+avio_wb64(pb, pkt->pts); /* presentation_time */
+avio_wb32(pb, 0xU); /* event_duration */
+avio_wb32(pb, 0); /* id */
+/* null terminated UTF8 strings */
+avio_write(pb, scheme_id_uri, strlen(scheme_id_uri) + 1);
+avio_write(pb, value, strlen(value) + 1);
+avio_write(pb, pkt->data, pkt->size);
+
+return update_size(pb, pos);
+}
+
static int mov_write_packet(AVFormatContext *s, AVPacket *pkt)
{
MOVMuxContext *mov = s->priv_data;
@@ -6722,6 +6755,11 @@ static int mov_write_packet(AVFormatContext *s, AVPacket
*pkt)
return 1;
}
+if (s->streams[pkt->stream_index]->codecpar->codec_id ==
AV_CODEC_ID_TIMED_ID3) {
+mov_write_emsg_tag(s->pb, s->streams[pkt->stream_index], pkt);
+return 0;
+}
+
trk = s->streams[pkt->stream_index]->priv_data;
#if CONFIG_IAMFENC
@@ -7381,6 +7419,12 @@ static int mov_init(AVFormatContext *s)
AVStream *st = s->streams[i];
if (st->priv_data)
continue;
+// Don't produce a track in the output file for timed ID3 streams.
+if (st->codecpar->codec_id == AV_CODEC_ID_TIMED_ID3) {
+// Leave priv_data set to NULL for these AVStreams that don't
+// have a corresponding track.
+continue;
+}
st->priv_data = st;
mov->nb_tracks++;
}
@@ -7480,6 +7524,9 @@ static int mov_init(AVFormatContext *s)
MOVTrack *track = st->priv_data;
AVDictionaryEntry *lang = av_dict_get(st->metadata, "language",
NULL,0);
+if (!track)
+continue;
+
if (!track->st) {
track->st = st;
track->par = st->codecpar;
diff --git a/libavformat/tests/movenc.c b/libavformat/tests/movenc.c
index 77f73abdfa..bb115b0821 100644
--- a/libavformat/tests/movenc.c
+++ b/libavformat/tests/movenc.c
@@ -58,7 +58,7 @@ struct AVMD5* md5;
uint8_t hash[HASH_SIZE];
AVPacket *pkt;
-AVStream *video_st, *audio_st;
+AVStream *video_st, *audio_st, *id3_st;
int64_t audio_dts, video_dts;
int bframes;
@@ -177,7 +177,7 @@ static void che
[FFmpeg-cvslog] doc/muxers: add ivf
ffmpeg | branch: master | Stefano Sabatini | Sat Apr 6
12:17:46 2024 +0200| [4fe3c8dcfd550e04021d465d0ecbc1cacd3d53e9] | committer:
Stefano Sabatini
doc/muxers: add ivf
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4fe3c8dcfd550e04021d465d0ecbc1cacd3d53e9
---
doc/muxers.texi | 9 +
1 file changed, 9 insertions(+)
diff --git a/doc/muxers.texi b/doc/muxers.texi
index d8a1f83309..29b6fa1427 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -2700,6 +2700,15 @@ computer-generated compositions.
This muxer accepts a single audio stream containing PCM data.
+@section ivf
+On2 IVF muxer.
+
+IVF was developed by On2 Technologies (formerly known as Duck
+Corporation), to store internally developed codecs.
+
+This muxer accepts a single @samp{vp8}, @samp{vp9}, or @samp{av1}
+video stream.
+
@section matroska
Matroska container muxer.
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] doc/muxers: add kvag
ffmpeg | branch: master | Stefano Sabatini | Sat Apr 6
12:38:04 2024 +0200| [57d64bb715efc9fde58a733e6cafaada6ffc6a75] | committer:
Stefano Sabatini
doc/muxers: add kvag
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=57d64bb715efc9fde58a733e6cafaada6ffc6a75
---
doc/muxers.texi | 8
1 file changed, 8 insertions(+)
diff --git a/doc/muxers.texi b/doc/muxers.texi
index 6b85befb43..6eea856a40 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -2717,6 +2717,14 @@ This muxer accepts a single @samp{jacosub} subtitles
stream.
For more information about the format, see
@url{http://unicorn.us.com/jacosub/jscripts.html}.
+@section kvag
+Simon & Schuster Interactive VAG muxer.
+
+This custom VAG container is used by some Simon & Schuster Interactive
+games such as "Real War", and "Real War: Rogue States".
+
+This muxer accepts a single @samp{adpcm_ima_ssi} audio stream.
+
@section matroska
Matroska container muxer.
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] doc/muxers: add jacosub
ffmpeg | branch: master | Stefano Sabatini | Sat Apr 6
12:29:57 2024 +0200| [f7fd22856046c94c06b80878e70d48881fa7fece] | committer:
Stefano Sabatini
doc/muxers: add jacosub
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7fd22856046c94c06b80878e70d48881fa7fece
---
doc/muxers.texi | 8
1 file changed, 8 insertions(+)
diff --git a/doc/muxers.texi b/doc/muxers.texi
index 29b6fa1427..6b85befb43 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -2709,6 +2709,14 @@ Corporation), to store internally developed codecs.
This muxer accepts a single @samp{vp8}, @samp{vp9}, or @samp{av1}
video stream.
+@section jacosub
+JACOsub subtitle format muxer.
+
+This muxer accepts a single @samp{jacosub} subtitles stream.
+
+For more information about the format, see
+@url{http://unicorn.us.com/jacosub/jscripts.html}.
+
@section matroska
Matroska container muxer.
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] doc/muxers/matroska: apply misc consistency fixups
ffmpeg | branch: master | Stefano Sabatini | Sat Apr 6
13:08:21 2024 +0200| [7e59c4f90885a9b0a3f1d385b4eae3530529] | committer:
Stefano Sabatini
doc/muxers/matroska: apply misc consistency fixups
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7e59c4f90885a9b0a3f1d385b4eae3530529
---
doc/muxers.texi | 14 --
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/doc/muxers.texi b/doc/muxers.texi
index 3928ebc549..4b30970b78 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -2751,13 +2751,11 @@ If @samp{encoder_version} is not explicitly set, it is
automatically
set to the libavformat version.
@section matroska
-
Matroska container muxer.
This muxer implements the matroska and webm container specs.
@subsection Metadata
-
The recognized metadata settings in this muxer are:
@table @option
@@ -2817,11 +2815,8 @@ ffmpeg -i sample_left_right_clip.mpg -an -c:v libvpx
-metadata stereo_mode=left_
@end example
@subsection Options
-
-This muxer supports the following options:
-
@table @option
-@item reserve_index_space
+@item reserve_index_space @var{index}
By default, this muxer writes the index for seeking (called cues in Matroska
terms) at the end of the file, because it cannot know in advance how much space
to leave for the index at the beginning of the file. However for some use cases
@@ -2837,7 +2832,7 @@ A safe size for most use cases should be about 50kB per
hour of video.
Note that cues are only written if the output is seekable and this option will
have no effect if it is not.
-@item cues_to_front
+@item cues_to_front @var{bool}
If set, the muxer will write the index at the beginning of the file
by shifting the main data if necessary. This can be combined with
reserve_index_space in which case the data is only shifted if
@@ -2845,7 +2840,7 @@ the initially reserved space turns out to be insufficient.
This option is ignored if the output is unseekable.
-@item default_mode
+@item default_mode @var{mode}
This option controls how the FlagDefault of the output tracks will be set.
It influences which tracks players should play by default. The default mode
is @samp{passthrough}.
@@ -2865,12 +2860,11 @@ In this mode the FlagDefault is set if and only if the
AV_DISPOSITION_DEFAULT
flag is set in the disposition of the corresponding stream.
@end table
-@item flipped_raw_rgb
+@item flipped_raw_rgb @var{bool}
If set to true, store positive height for raw RGB bitmaps, which indicates
bitmap is stored bottom-up. Note that this option does not flip the bitmap
which has to be done manually beforehand, e.g. by using the vflip filter.
Default is @var{false} and indicates bitmap is stored top down.
-
@end table
@anchor{md5}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] doc/muxers: add lrc
ffmpeg | branch: master | Stefano Sabatini | Sat Apr 6
12:55:58 2024 +0200| [8510108c1d8273cec2c5053e3b860f3aa89da8e9] | committer:
Stefano Sabatini
doc/muxers: add lrc
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8510108c1d8273cec2c5053e3b860f3aa89da8e9
---
doc/muxers.texi | 25 +
1 file changed, 25 insertions(+)
diff --git a/doc/muxers.texi b/doc/muxers.texi
index 6eea856a40..3928ebc549 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -2725,6 +2725,31 @@ games such as "Real War", and "Real War: Rogue States".
This muxer accepts a single @samp{adpcm_ima_ssi} audio stream.
+@section lrc
+LRC lyrics file format muxer.
+
+LRC (short for LyRiCs) is a computer file format that synchronizes
+song lyrics with an audio file, such as MP3, Vorbis, or MIDI.
+
+This muxer accepts a single @samp{subrip} or @samp{text} subtitles stream.
+
+@subsection Metadata
+The following metadata tags are converted to the format corresponding
+metadata:
+
+@table @option
+@item title
+@item album
+@item artist
+@item author
+@item creator
+@item encoder
+@item encoder_version
+@end table
+
+If @samp{encoder_version} is not explicitly set, it is automatically
+set to the libavformat version.
+
@section matroska
Matroska container muxer.
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavfi/dnn_backend_torch: Include mem.h
ffmpeg | branch: master | Fei Wang | Tue Apr 2 11:02:17
2024 +0800| [0534d2ac8462e39955b83760d3148ccf45a1e310] | committer: Guo Yejun
lavfi/dnn_backend_torch: Include mem.h
Fix build fail since 790f793844.
Signed-off-by: Fei Wang
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0534d2ac8462e39955b83760d3148ccf45a1e310
---
libavfilter/dnn/dnn_backend_torch.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavfilter/dnn/dnn_backend_torch.cpp
b/libavfilter/dnn/dnn_backend_torch.cpp
index fa9a2e6d99..ae55893a50 100644
--- a/libavfilter/dnn/dnn_backend_torch.cpp
+++ b/libavfilter/dnn/dnn_backend_torch.cpp
@@ -31,6 +31,7 @@ extern "C" {
#include "dnn_io_proc.h"
#include "dnn_backend_common.h"
#include "libavutil/opt.h"
+#include "libavutil/mem.h"
#include "queue.h"
#include "safe_queue.h"
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] lavc/avfft: fix RDFT wrapper stride
ffmpeg | branch: master | Lynne | Sat Apr 6 07:30:07 2024 +0200| [89a9042291e2f54be98e54e8e8fa50ee3fe7d1a6] | committer: Lynne lavc/avfft: fix RDFT wrapper stride Per the lavu/tx docs: > * For forward transforms (R2C), stride must be the spacing between two > * samples in bytes. For inverse transforms, the stride must be set > * to the spacing between two complex values in bytes. The code did the reverse. The stride parameter is currently not respected for RDFT transforms, but has to be correct, for a potential future change. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89a9042291e2f54be98e54e8e8fa50ee3fe7d1a6 --- libavcodec/avfft.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/avfft.c b/libavcodec/avfft.c index 627fd7a0be..f6787937f6 100644 --- a/libavcodec/avfft.c +++ b/libavcodec/avfft.c @@ -158,7 +158,7 @@ RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans) return NULL; } -s->stride = (trans == DFT_C2R) ? sizeof(float) : sizeof(AVComplexFloat); +s->stride = (trans == DFT_C2R) ? sizeof(AVComplexFloat) : sizeof(float); s->len = 1 << nbits; s->inv = trans == IDFT_C2R; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] tests/checkasm: add exclude_guest for non-x86 linux perf
ffmpeg | branch: master | J. Dekker | Tue Apr 9 16:49:11
2024 +0200| [985fdf8e3d616633f1dc13920491bab45b1aa758] | committer: J. Dekker
tests/checkasm: add exclude_guest for non-x86 linux perf
The exclude_guest option only has an effect on x86. Omitting
'exclude_guest' defaults to zero which implies that you can count guest
events should you run one. Some non-x86 kernels just ignore it, while
others (e.g. the Asahi Linux kernels) require the user to explicitly set
the option to 1, i.e. the only behaviour that makes sense when counting
guest events isn't supported.
Signed-off-by: J. Dekker
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=985fdf8e3d616633f1dc13920491bab45b1aa758
---
tests/checkasm/checkasm.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
index dcd2fd6957..8be6cb0f55 100644
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -742,6 +742,9 @@ static int bench_init_linux(void)
.disabled = 1, // start counting only on demand
.exclude_kernel = 1,
.exclude_hv = 1,
+#if !ARCH_X86
+.exclude_guest = 1,
+#endif
};
printf("benchmarking with Linux Perf Monitoring API\n");
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] Revert "bsf: use standard include paths"
ffmpeg | branch: master | Anton Khirnov | Wed Apr 10
15:17:54 2024 +0200| [0e4dfa470958a6bc6c6a673491dda5adf758c6c2] | committer:
Anton Khirnov
Revert "bsf: use standard include paths"
This reverts commit 41b73ae883ec2a70c814e394de0e5ae5f1f13e87.
This patch was pushed extremely quickly, without giving developers the
time to object.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e4dfa470958a6bc6c6a673491dda5adf758c6c2
---
libavcodec/bsf/Makefile | 2 ++
libavcodec/bsf/aac_adtstoasc.c| 16
libavcodec/bsf/av1_frame_merge.c | 8
libavcodec/bsf/av1_frame_split.c | 8
libavcodec/bsf/av1_metadata.c | 10 +-
libavcodec/bsf/chomp.c| 4 ++--
libavcodec/bsf/dca_core.c | 8
libavcodec/bsf/dts2pts.c | 12 ++--
libavcodec/bsf/dump_extradata.c | 4 ++--
libavcodec/bsf/dv_error_marker.c | 4 ++--
libavcodec/bsf/eac3_core.c| 8
libavcodec/bsf/evc_frame_merge.c | 12 ++--
libavcodec/bsf/extract_extradata.c| 22 +++---
libavcodec/bsf/filter_units.c | 6 +++---
libavcodec/bsf/h264_metadata.c| 20 ++--
libavcodec/bsf/h264_mp4toannexb.c | 10 +-
libavcodec/bsf/h264_redundant_pps.c | 16
libavcodec/bsf/h265_metadata.c| 16
libavcodec/bsf/h266_metadata.c| 12 ++--
libavcodec/bsf/hapqa_extract.c| 8
libavcodec/bsf/hevc_mp4toannexb.c | 10 +-
libavcodec/bsf/imx_dump_header.c | 6 +++---
libavcodec/bsf/media100_to_mjpegb.c | 6 +++---
libavcodec/bsf/mjpeg2jpeg.c | 8
libavcodec/bsf/mjpega_dump_header.c | 8
libavcodec/bsf/movsub.c | 4 ++--
libavcodec/bsf/mpeg2_metadata.c | 12 ++--
libavcodec/bsf/mpeg4_unpack_bframes.c | 8
libavcodec/bsf/noise.c| 4 ++--
libavcodec/bsf/null.c | 2 +-
libavcodec/bsf/opus_metadata.c| 4 ++--
libavcodec/bsf/pcm_rechunk.c | 4 ++--
libavcodec/bsf/pgs_frame_merge.c | 4 ++--
libavcodec/bsf/prores_metadata.c | 4 ++--
libavcodec/bsf/remove_extradata.c | 14 +++---
libavcodec/bsf/setts.c| 4 ++--
libavcodec/bsf/showinfo.c | 4 ++--
libavcodec/bsf/trace_headers.c| 6 +++---
libavcodec/bsf/truehd_core.c | 10 +-
libavcodec/bsf/vp9_metadata.c | 10 +-
libavcodec/bsf/vp9_raw_reorder.c | 8
libavcodec/bsf/vp9_superframe.c | 6 +++---
libavcodec/bsf/vp9_superframe_split.c | 8
libavcodec/bsf/vvc_mp4toannexb.c | 10 +-
44 files changed, 186 insertions(+), 184 deletions(-)
diff --git a/libavcodec/bsf/Makefile b/libavcodec/bsf/Makefile
index e506ac61fd..fb70ad0c21 100644
--- a/libavcodec/bsf/Makefile
+++ b/libavcodec/bsf/Makefile
@@ -45,3 +45,5 @@ OBJS-$(CONFIG_VP9_SUPERFRAME_BSF) +=
bsf/vp9_superframe.o
OBJS-$(CONFIG_VP9_SUPERFRAME_SPLIT_BSF) += bsf/vp9_superframe_split.o
OBJS-$(CONFIG_VVC_METADATA_BSF) += bsf/h266_metadata.o
OBJS-$(CONFIG_VVC_MP4TOANNEXB_BSF)+= bsf/vvc_mp4toannexb.o
+
+libavcodec/bsf/%.o: CPPFLAGS += -I$(SRC_PATH)/libavcodec/
diff --git a/libavcodec/bsf/aac_adtstoasc.c b/libavcodec/bsf/aac_adtstoasc.c
index 08373fc3b2..dd5e8b2a31 100644
--- a/libavcodec/bsf/aac_adtstoasc.c
+++ b/libavcodec/bsf/aac_adtstoasc.c
@@ -19,14 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavcodec/adts_header.h"
-#include "libavcodec/adts_parser.h"
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/put_bits.h"
-#include "libavcodec/get_bits.h"
-#include "libavcodec/mpeg4audio.h"
-#include "libavcodec/mpeg4audio_copy_pce.h"
+#include "adts_header.h"
+#include "adts_parser.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "put_bits.h"
+#include "get_bits.h"
+#include "mpeg4audio.h"
+#include "mpeg4audio_copy_pce.h"
typedef struct AACBSFContext {
int first_frame_done;
diff --git a/libavcodec/bsf/av1_frame_merge.c b/libavcodec/bsf/av1_frame_merge.c
index 12d53fba7c..4c54f2167e 100644
--- a/libavcodec/bsf/av1_frame_merge.c
+++ b/libavcodec/bsf/av1_frame_merge.c
@@ -18,10 +18,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/cbs.h"
-#include "libavcodec/cbs_av1.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "cbs.h"
+#include "cbs_av1.h"
typedef struct AV1FMergeContext {
CodedBitstreamContext *input;
diff --git a/libavcodec/bsf/av1_frame_split.c b/libavcodec/bsf/av1_frame_split.c
index 953aa83fc2..5f6a40316c 100644
--- a/libavcodec/bsf/av1_frame_split.c
+++ b/libavcodec/bsf/av1_frame_split.c
@@
