[FFmpeg-cvslog] avformat/dashdec: accept and relay CENC decryption key
ffmpeg | branch: master | Gyan Doshi | Sat May 14 14:56:56
2022 +0530| [8b64d8d9aa7fede94ab531b7be3f73cd2f3c448c] | committer: Gyan Doshi
avformat/dashdec: accept and relay CENC decryption key
Allows to process CENC-encrypted media segments.
Option arg syntax is same as that for option decryption_key in MOV demuxer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b64d8d9aa7fede94ab531b7be3f73cd2f3c448c
---
doc/demuxers.texi | 11 +++
libavformat/dashdec.c | 5 +
2 files changed, 16 insertions(+)
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 238b8e03a8..c95a9ae594 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -274,6 +274,17 @@ which streams to actually receive.
Each stream mirrors the @code{id} and @code{bandwidth} properties from the
@code{} as metadata keys named "id" and "variant_bitrate"
respectively.
+@subsection Options
+
+This demuxer accepts the following option:
+
+@table @option
+
+@item cenc_decryption_key
+16-byte key, in hex, to decrypt files encrypted using ISO Common Encryption
(CENC/AES-128 CTR; ISO/IEC 23001-7).
+
+@end table
+
@section imf
Interoperable Master Format demuxer.
diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c
index 0b5ff5aeb9..0f66251354 100644
--- a/libavformat/dashdec.c
+++ b/libavformat/dashdec.c
@@ -150,6 +150,7 @@ typedef struct DASHContext {
char *allowed_extensions;
AVDictionary *avio_opts;
int max_url_size;
+char *cenc_decryption_key;
/* Flags for init section*/
int is_init_section_common_video;
@@ -1893,6 +1894,9 @@ static int reopen_demux_for_component(AVFormatContext *s,
struct representation
pls->ctx->pb = &pls->pb.pub;
pls->ctx->io_open = nested_io_open;
+if (c->cenc_decryption_key)
+av_dict_set(&in_fmt_opts, "decryption_key", c->cenc_decryption_key,
AV_OPT_FLAG_DECODING_PARAM);
+
// provide additional information from mpd if available
ret = avformat_open_input(&pls->ctx, "", in_fmt, &in_fmt_opts);
//pls->init_section->url
av_dict_free(&in_fmt_opts);
@@ -2344,6 +2348,7 @@ static const AVOption dash_options[] = {
OFFSET(allowed_extensions), AV_OPT_TYPE_STRING,
{.str = "aac,m4a,m4s,m4v,mov,mp4,webm,ts"},
INT_MIN, INT_MAX, FLAGS},
+{ "cenc_decryption_key", "Media decryption key (hex)",
OFFSET(cenc_decryption_key), AV_OPT_TYPE_STRING, {.str = NULL}, INT_MIN,
INT_MAX, .flags = FLAGS },
{NULL}
};
___
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] avfilter/af_acrossover: add precision option
ffmpeg | branch: master | Paul B Mahol | Sat May 14 14:10:07
2022 +0200| [e6f0cec88041449475f37b82b76699d2f7b5b124] | committer: Paul B Mahol
avfilter/af_acrossover: add precision option
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6f0cec88041449475f37b82b76699d2f7b5b124
---
doc/filters.texi| 16
libavfilter/af_acrossover.c | 44 +++-
2 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index 45ebcccf1c..b6cbdc85cc 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -557,6 +557,22 @@ Set input gain level. Allowed range is from 0 to 1.
Default value is 1.
@item gains
Set output gain for each band. Default value is 1 for all bands.
+
+@item precision
+Set which precision to use when processing samples.
+
+@table @option
+@item auto
+Auto pick internal sample format depending on other filters.
+
+@item float
+Always use single-floating point precision sample format.
+
+@item double
+Always use double-floating point precision sample format.
+@end table
+
+Default value is @code{auto}.
@end table
@subsection Examples
diff --git a/libavfilter/af_acrossover.c b/libavfilter/af_acrossover.c
index 518095..417e857133 100644
--- a/libavfilter/af_acrossover.c
+++ b/libavfilter/af_acrossover.c
@@ -58,6 +58,7 @@ typedef struct AudioCrossoverContext {
char *gains_str;
int order_opt;
float level_in;
+int precision;
int order;
int filter_count;
@@ -99,11 +100,52 @@ static const AVOption acrossover_options[] = {
{ "20th", "20th order (120 dB/8ve)",0, AV_OPT_TYPE_CONST,
{.i64=9}, 0, 0, AF, "m" },
{ "level", "set input gain",OFFSET(level_in), AV_OPT_TYPE_FLOAT,
{.dbl=1}, 0, 1, AF },
{ "gain", "set output bands gain", OFFSET(gains_str),
AV_OPT_TYPE_STRING, {.str="1.f"}, 0, 0, AF },
+{ "precision", "set processing precision", OFFSET(precision),
AV_OPT_TYPE_INT, {.i64=0}, 0, 2, AF, "precision" },
+{ "auto", "set auto processing precision", 0,
AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, AF, "precision" },
+{ "float", "set single-floating point processing precision", 0,
AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, AF, "precision" },
+{ "double","set double-floating point processing precision", 0,
AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, AF, "precision" },
{ NULL }
};
AVFILTER_DEFINE_CLASS(acrossover);
+static int query_formats(AVFilterContext *ctx)
+{
+AudioCrossoverContext *s = ctx->priv;
+static const enum AVSampleFormat auto_sample_fmts[] = {
+AV_SAMPLE_FMT_FLTP,
+AV_SAMPLE_FMT_DBLP,
+AV_SAMPLE_FMT_NONE
+};
+enum AVSampleFormat sample_fmts[] = {
+AV_SAMPLE_FMT_FLTP,
+AV_SAMPLE_FMT_NONE
+};
+const enum AVSampleFormat *sample_fmts_list = sample_fmts;
+int ret = ff_set_common_all_channel_counts(ctx);
+if (ret < 0)
+return ret;
+
+switch (s->precision) {
+case 0:
+sample_fmts_list = auto_sample_fmts;
+break;
+case 1:
+sample_fmts[0] = AV_SAMPLE_FMT_FLTP;
+break;
+case 2:
+sample_fmts[0] = AV_SAMPLE_FMT_DBLP;
+break;
+default:
+break;
+}
+ret = ff_set_common_formats_from_list(ctx, sample_fmts_list);
+if (ret < 0)
+return ret;
+
+return ff_set_common_all_samplerates(ctx);
+}
+
static int parse_gains(AVFilterContext *ctx)
{
AudioCrossoverContext *s = ctx->priv;
@@ -586,7 +628,7 @@ const AVFilter ff_af_acrossover = {
.uninit = uninit,
FILTER_INPUTS(inputs),
.outputs= NULL,
-FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP),
+FILTER_QUERY_FUNC(query_formats),
.flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS |
AVFILTER_FLAG_SLICE_THREADS,
};
___
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] Tag n3.2.18 : FFmpeg 3.2.18 release
[ffmpeg] [branch: refs/tags/n3.2.18] Tag:2dfe5c46d9ee1daae3a115a2373e20773fb8dd97 > http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=2dfe5c46d9ee1daae3a115a2373e20773fb8dd97 Tagger: Michael Niedermayer Date: Sat May 14 23:17:43 2022 +0200 FFmpeg 3.2.18 release ___ 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] [ffmpeg-web] branch master updated. 272a8c7 web: add FFmpeg 3.2.18
The branch, master has been updated via 272a8c7fe91bc9802bee5b6d7771e556d2eab81d (commit) from 71f48053ff2a318c3588daa1565e16111e08403d (commit) - Log - commit 272a8c7fe91bc9802bee5b6d7771e556d2eab81d Author: Michael Niedermayer AuthorDate: Sun May 15 00:00:56 2022 +0200 Commit: Michael Niedermayer CommitDate: Sun May 15 00:00:56 2022 +0200 web: add FFmpeg 3.2.18 diff --git a/src/download b/src/download index 5b6f4c9..5f10759 100644 --- a/src/download +++ b/src/download @@ -524,10 +524,10 @@ libpostproc54. 7.100 - FFmpeg 3.2.17 "Hypatia" + FFmpeg 3.2.18 "Hypatia" -3.2.17 was released on 2022-04-23. It is the latest stable FFmpeg release +3.2.18 was released on 2022-05-15. It is the latest stable FFmpeg release from the 3.2 release branch, which was cut from master on 2016-10-26. It includes the following library versions: @@ -545,19 +545,19 @@ libpostproc54. 1.100 - Download xz tarball - PGP signature + Download xz tarball + PGP signature - Download bzip2 tarball - PGP signature + Download bzip2 tarball + PGP signature - Download gzip tarball - PGP signature + Download gzip tarball + PGP signature - https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n3.2.17";>Changelog + https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n3.2.18";>Changelog https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/3.2:/RELEASE_NOTES";>Release Notes diff --git a/src/security b/src/security index 68f5d4c..751b573 100644 --- a/src/security +++ b/src/security @@ -686,6 +686,29 @@ CVE-2017-7866, e371f031b942d73e02c090170975561fabd5c264 FFmpeg 3.2 +3.2.18 + +Fixes following vulnerabilities: + + +CVE-2020-20451, ee92ee3b5a80e3a0c12567efc9761343d0155c21 / 21265f42ecb265debe9fec1dbfd0cb7de5a8aefb, ticket/8094 +CVE-2020-21041, 322b066d6533de16f5854d3ff358097e1ab9e87e / 5d9f44da460f781a1604d537d0555b78e29438ba, ticket/7989 +CVE-2020-22016, a95d2099b8edb6bb906751a7e27984de2d8930d8 / 58aa0ed8f10753ee90f4a4a1f4f3da803cf7c145, ticket/8183 +CVE-2020-22020, 0744d7176ae1027d5ad7de28b283a78d58e64545 / ce5274c1385d55892a692998923802023526b765, ticket/8239 +CVE-2020-22022, 07bc7b2c075f510e344b49416adaf13b9a896a81 / 07050d7bdc32d82e53ee5bb727f5882323d00dba, ticket/8264 +CVE-2020-22023, ab0b268bb78ccd5ba4411594ae74a368ad2186e1 / 0b567238741854b41f84f7457686b044eadfe29c, ticket/8244 +CVE-2020-22025, 7cab59a34f3acafd165a5fc407d0af7a67bc70ce / ccf4ab8c9aca0aee66bcc2914031a9c97ac0eeb8, ticket/8260 +CVE-2020-22026, a9b8eda77306829c9165bc306aafd6e1a91f14c0 / 58bb9d3a3a6ede1c6cfb82bf671a5f138e6b2144, ticket/8317 +CVE-2020-22028, ff93d6f710fa95476e0e90dec6cb1303afe26e0f / f069a9c2a65bc20c3462127623127df6dfd06c5b, ticket/8274 +CVE-2020-22031, fd8b08ebbb27e841fd5527e4b800ab3738216e9d / 0e68e8c93f9068596484ec8ba725586860e06fc8, ticket/8243 +CVE-2020-22032, e998d8c90da1f41eeecd411d37a5168fecb8 / de598f82f8c3f8000e1948548e8088148e2b1f44, ticket/8275 +CVE-2020-22036, 7004a214d02d54ae969aa8d6f5788f728813079d / 8c3166e1c302c3ba80d9742ae46161c0fa8e2606, ticket/8261 +CVE-2020-22041, 5b4100cbaedfea847a10c689c0dc75313972c350 / 3488e0977c671568731afa12b811adce9d4d807f, ticket/8296 +CVE-2020-22044, c7c2f4975b23dc2ba6b3324a41bb495fcb4656d6 / 1d479300cbe0522c233b7d51148aea2b29bd29ad, ticket/8295 +CVE-2020-22046, bbc9751da67286d27f379dbe3b52ee3b55b0503e / 097c917c147661f5378dae8fe3f7e46f43236426, ticket/8294 +CVE-2020-22048, 64d2e0b20066058cf1c6dc3c49adab6d18d66fcc / fddef964e8aa4a2c123e470db1436a082ff6bcf3, ticket/8303 + + 3.2.16 Fixes following vulnerabilities: --- Summary of changes: src/download | 18 +- src/security | 23 +++ 2 files changed, 32 insertions(+), 9 deletions(-) hooks/post-receive -- ___ 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] Tag n2.8.20 : FFmpeg 2.8.20 release
[ffmpeg] [branch: refs/tags/n2.8.20] Tag:29ee89f892d8293d084cc566f1f465cf0f19dd9a > http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=29ee89f892d8293d084cc566f1f465cf0f19dd9a Tagger: Michael Niedermayer Date: Sun May 15 00:02:33 2022 +0200 FFmpeg 2.8.20 release ___ 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] [ffmpeg-web] branch master updated. d4a25b1 web: Add FFmpeg 2.8.20
The branch, master has been updated via d4a25b141f0a4dadea3b621c6da8c48dde16f608 (commit) from 272a8c7fe91bc9802bee5b6d7771e556d2eab81d (commit) - Log - commit d4a25b141f0a4dadea3b621c6da8c48dde16f608 Author: Michael Niedermayer AuthorDate: Sun May 15 00:40:09 2022 +0200 Commit: Michael Niedermayer CommitDate: Sun May 15 00:40:09 2022 +0200 web: Add FFmpeg 2.8.20 diff --git a/src/download b/src/download index 5f10759..d262e94 100644 --- a/src/download +++ b/src/download @@ -562,10 +562,10 @@ libpostproc54. 1.100 - FFmpeg 2.8.19 "Feynman" + FFmpeg 2.8.20 "Feynman" -2.8.19 was released on 2022-04-26. It is the latest stable FFmpeg release +2.8.20 was released on 2022-05-15. It is the latest stable FFmpeg release from the 2.8 release branch, which was cut from master on 2015-09-05. Amongst lots of other changes, it includes all changes from ffmpeg-mt, libav master of 2015-08-28, libav 11 as of 2015-08-28. @@ -585,19 +585,19 @@ libpostproc53. 3.100 - Download xz tarball - PGP signature + Download xz tarball + PGP signature - Download bzip2 tarball - PGP signature + Download bzip2 tarball + PGP signature - Download gzip tarball - PGP signature + Download gzip tarball + PGP signature - https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n2.8.19";>Changelog + https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n2.8.20";>Changelog https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/2.8:/RELEASE_NOTES";>Release Notes diff --git a/src/security b/src/security index 751b573..49ba720 100644 --- a/src/security +++ b/src/security @@ -686,6 +686,24 @@ CVE-2017-7866, e371f031b942d73e02c090170975561fabd5c264 FFmpeg 3.2 +3.2.18 + +Fixes following vulnerabilities: + + +CVE-2020-20451, 0c949b6ebfcee1b23a5fe33a3bc8af167956ea1e / 21265f42ecb265debe9fec1dbfd0cb7de5a8aefb, ticket/8094 +CVE-2020-21041, 3d350ec7281cd0d357231fc2c99f44ebe425d586 / 5d9f44da460f781a1604d537d0555b78e29438ba, ticket/7989 +CVE-2020-22016, 02161c6ed194ddfa00fd2af7684a8099852bc3ce / 58aa0ed8f10753ee90f4a4a1f4f3da803cf7c145, ticket/8183 +CVE-2020-22020, 93ad1e4a9f17ac5145c2957bb270a454c8a0cefd / ce5274c1385d55892a692998923802023526b765, ticket/8239 +CVE-2020-22022, ea5d154845dfc1c6e550d197d7da79aee87c9f66 / 07050d7bdc32d82e53ee5bb727f5882323d00dba, ticket/8264 +CVE-2020-22025, ff73a50456b93e8d555603c093a3ebd193d0b097 / ccf4ab8c9aca0aee66bcc2914031a9c97ac0eeb8, ticket/8260 +CVE-2020-22031, 1a4d18820d551bedcfa03b7e8ca72df87d4b5cfa / 0e68e8c93f9068596484ec8ba725586860e06fc8, ticket/8243 +CVE-2020-22032, a19796a15ee0ab82e2b70d253d328111e9f916e0 / de598f82f8c3f8000e1948548e8088148e2b1f44, ticket/8275 +CVE-2020-22041, 4f566654e744c7810f4afdd91fe00fdd1ef46646 / 3488e0977c671568731afa12b811adce9d4d807f, ticket/8296 +CVE-2020-22044, 40dfd623632ed22bf3c98465ae3e68fcb1f31200 / 1d479300cbe0522c233b7d51148aea2b29bd29ad, ticket/8295 +CVE-2020-22046, 1a541dc0c5e1279251c9ed4cd416005fcca6e748 / 097c917c147661f5378dae8fe3f7e46f43236426, ticket/8294 + + 3.2.18 Fixes following vulnerabilities: --- Summary of changes: src/download | 18 +- src/security | 18 ++ 2 files changed, 27 insertions(+), 9 deletions(-) hooks/post-receive -- ___ 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".
