October 2021 - ffmpeg-cvslog - lists.ffmpeg.org

[ffmpeg-web] branch master updated. e266f0f web/security: fix inconsistent formatting
by ffmpeg-git＠ffmpeg.org 24 Oct '21

24 Oct '21

The branch, master has been updated via e266f0f82fe9d5845790dbc6e6f0bc1de45d29de (commit) from e6c4f7c832630f3fa30917bdcf4d71de33e36f76 (commit) - Log ----------------------------------------------------------------- commit e266f0f82fe9d5845790dbc6e6f0bc1de45d29de Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Sun Oct 24 23:41:50 2021 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Oct 24 23:41:50 2021 +0200 web/security: fix inconsistent formatting Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/src/security b/src/security index ec90c33..72ed898 100644 --- a/src/security +++ b/src/security @@ -7,11 +7,11 @@ Fixes following vulnerabilities: </p> <pre> -4254dbe20fea3e3e1897c82027f148c868d6c11e CVE-2020-22037, / 7bba0dd6382e30d646cb406034a66199e071d713, ticket/8281 -43bdf562c3f69261d742dd35dfe5147fb3c007d0 CVE-2021-33815, / 26d3c81bc5ef2f8c3f09d45eaeacfb4b1139a777 -46bbf194c44e49f08bbb028c5b933a901a84a7bd CVE-2021-38114, / 7150f9575671f898382c370acae35f9087a30ba1 -fb993619d1035fa9646506925ea70fb122038999 CVE-2021-38171, / 9ffa49496d1aae4cbbb387aac28a9e061a6ab0a6 -07dec5b0c383ebd6053bdf0a022dfe4aa01b9b70 CVE-2021-38291, / e01d306c647b5827102260b885faa223b646d2d1, ticket/9312 +CVE-2020-22037, 4254dbe20fea3e3e1897c82027f148c868d6c11e / 7bba0dd6382e30d646cb406034a66199e071d713, ticket/8281 +CVE-2021-33815, 43bdf562c3f69261d742dd35dfe5147fb3c007d0 / 26d3c81bc5ef2f8c3f09d45eaeacfb4b1139a777 +CVE-2021-38114, 46bbf194c44e49f08bbb028c5b933a901a84a7bd / 7150f9575671f898382c370acae35f9087a30ba1 +CVE-2021-38171, fb993619d1035fa9646506925ea70fb122038999 / 9ffa49496d1aae4cbbb387aac28a9e061a6ab0a6 +CVE-2021-38291, 07dec5b0c383ebd6053bdf0a022dfe4aa01b9b70 / e01d306c647b5827102260b885faa223b646d2d1, ticket/9312 </pre> <h3>4.4</h3> ----------------------------------------------------------------------- Summary of changes: src/security | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) hooks/post-receive --

1 0

[ffmpeg-web] branch master updated. e6c4f7c web/security: add CVE#s for recent releases
by ffmpeg-git＠ffmpeg.org 24 Oct '21

24 Oct '21

The branch, master has been updated via e6c4f7c832630f3fa30917bdcf4d71de33e36f76 (commit) via 351690137ecb76e7732f77184df4f593bc5159c0 (commit) from 4fc8bb64e0f21ed9e4e2fd1b8a9117a1cbd4e216 (commit) - Log ----------------------------------------------------------------- commit e6c4f7c832630f3fa30917bdcf4d71de33e36f76 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Sun Oct 24 23:37:49 2021 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Oct 24 23:37:49 2021 +0200 web/security: add CVE#s for recent releases Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/src/security b/src/security index 1248018..ec90c33 100644 --- a/src/security +++ b/src/security @@ -2,6 +2,18 @@ <h2>FFmpeg 4.4</h2> +<h3>4.4.1</h3> +<p> +Fixes following vulnerabilities: +</p> +<pre> +4254dbe20fea3e3e1897c82027f148c868d6c11e CVE-2020-22037, / 7bba0dd6382e30d646cb406034a66199e071d713, ticket/8281 +43bdf562c3f69261d742dd35dfe5147fb3c007d0 CVE-2021-33815, / 26d3c81bc5ef2f8c3f09d45eaeacfb4b1139a777 +46bbf194c44e49f08bbb028c5b933a901a84a7bd CVE-2021-38114, / 7150f9575671f898382c370acae35f9087a30ba1 +fb993619d1035fa9646506925ea70fb122038999 CVE-2021-38171, / 9ffa49496d1aae4cbbb387aac28a9e061a6ab0a6 +07dec5b0c383ebd6053bdf0a022dfe4aa01b9b70 CVE-2021-38291, / e01d306c647b5827102260b885faa223b646d2d1, ticket/9312 +</pre> + <h3>4.4</h3> <p> Fixes following vulnerabilities: @@ -16,12 +28,35 @@ CVE-2020-22038, 7c32e9cf93b712f8463573a59ed4e98fd10fa013, ticket/8285 CVE-2020-22042, 426c16d61a9b5056a157a1a2a057a4e4d13eef84, ticket/8267 CVE-2020-24020, 584f396132aa19d21bb1e38ad9a5d428869290cb, ticket/8718 CVE-2021-30123, d6f293353c94c7ce200f6e0975ae3de49787f91f, ticket/8845, never affected a release +CVE-2020-35964, 27a99e2c7d450fef15594671eef4465c8a166bd7 CVE-2020-35965, 3e5959b3457f7f1856d997261e6ac672bba49e8b CVE-2020-35965, b0a8b40294ea212c1938348ff112ef1b9bf16bb3 </pre> <h2>FFmpeg 4.3</h2> +<h3>4.3.3</h3> +<p> +Fixes following vulnerabilities: +</p> +<pre> +CVE-2020-20450, 3865b1952e5cf993b016d83ba78fe1deb63bbfad / 5400e4a50c61e53e1bc50b3e77201649bbe9c510, ticket/7993 +CVE-2020-22037, c6e7b345f5fd261ade273ea2d0cfa51fc6b512ac / 7bba0dd6382e30d646cb406034a66199e071d713, ticket/8281 +CVE-2020-22042, a23078a721682268caf03fc6d24a6ab202d309ae / 426c16d61a9b5056a157a1a2a057a4e4d13eef84, ticket/8267 +CVE-2021-38114, 7c455ee86a79b54857361e2a6eaf8a23783eaf3b / 7150f9575671f898382c370acae35f9087a30ba1 +CVE-2021-38171, 9f38effa59e2f7d9a0475cd90c02bbd76c8e75a1 / 9ffa49496d1aae4cbbb387aac28a9e061a6ab0a6 +CVE-2021-38291, 76470ae27fc8cd48890ee0cb6ff20c46bd984f67 / e01d306c647b5827102260b885faa223b646d2d1, ticket/9312 +</pre> + +<h3>4.3.2</h3> +<p> +Fixes following vulnerabilities: +</p> +<pre> +CVE-2020-35964, 4f0bdff292391cdb96b79b08c56533029166bdc8 / 27a99e2c7d450fef15594671eef4465c8a166bd7 +CVE-2020-35965, a53ffb15d8ae9bed14041b4cf62e436852e95431 / 3e5959b3457f7f1856d997261e6ac672bba49e8b +</pre> + <h3>4.3.1</h3> <p> Fixes following vulnerabilities: @@ -69,6 +104,19 @@ CVE-2020-22044, 1d479300cbe0522c233b7d51148aea2b29bd29ad, ticket/8295 <h2>FFmpeg 4.2</h2> +<h3>4.2.5</h3> +<p> +Fixes following vulnerabilities: +</p> +<pre> +CVE-2020-22037, 0f8a56d5aff8c6c8c414df4d938137131bbce32f / 7bba0dd6382e30d646cb406034a66199e071d713, ticket/8281 +CVE-2020-35964, 955b471fbe77bdab4f007c43c65e71c596e212b5 / 27a99e2c7d450fef15594671eef4465c8a166bd7 +CVE-2020-35965, 4810fe79363d196b87a73333d37d3baad6c04f49 / 3e5959b3457f7f1856d997261e6ac672bba49e8b +CVE-2021-38114, 796a84fd047099ba25329ee2c420d11709ebe8b1 / 7150f9575671f898382c370acae35f9087a30ba1 +CVE-2021-38171, 5976047ae0227fe4fdaea6b7d1bf6eb671984da6 / 9ffa49496d1aae4cbbb387aac28a9e061a6ab0a6 +CVE-2021-38291, d17624507ac5c2622fa8de74d213d8ba3df6387c / e01d306c647b5827102260b885faa223b646d2d1, ticket/9312 +</pre> + <h3>4.2.4</h3> <p> Fixes following vulnerabilities: @@ -114,6 +162,40 @@ CVE-2019-1000016, b97a4b658814b2de8b9f2a3bce491c002d34de31 <h2>FFmpeg 4.1</h2> +<h3>4.1.8</h3> +<p> +Fixes following vulnerabilities: +</p> +<pre> +CVE-2020-21041, e06e89f6275c62316da489c567fce3d2ef6f594a / 5d9f44da460f781a1604d537d0555b78e29438ba, ticket/7989 +CVE-2020-22017, aef4cbec696ae4e349a72521fba1180b96a97fab / d4d6b7b0355f3597cad3b8d12911790c73b5f96d, ticket/8309 +CVE-2020-22020, d60effdf83eddcdb18c84d339a526fb0318723fe / ce5274c1385d55892a692998923802023526b765, ticket/8239 +CVE-2020-22022, c79606f233fed20a6d31e6cd5f24466021eaf94b / 07050d7bdc32d82e53ee5bb727f5882323d00dba, ticket/8264 +CVE-2020-22023, 69f5d4b7fdcb93c2948255193870f5ea7605028c / 0b567238741854b41f84f7457686b044eadfe29c, ticket/8244 +CVE-2020-22026, 3a9f384225cb6e5720d36d0b01dd446cfd6f1772 / 58bb9d3a3a6ede1c6cfb82bf671a5f138e6b2144, ticket/8317 +CVE-2020-22027, f5da6cff3504978bf6e713996988dcef0691d800 / e787f8fd7ee99ba0c3e0f086ce2ce59eea7ed86c, ticket/8242 +CVE-2020-22028, 01f3824f6c46ef19025059752a4381daa2443097 / f069a9c2a65bc20c3462127623127df6dfd06c5b, ticket/8274 +CVE-2020-22029, 29f1cf0c0f5d90e81a438dc12a4782dc424bf5ec / a7fd1279703683ebb548ef7baa2f1519994496ae, ticket/8250 +CVE-2020-22030, df5e01770900f11eec0c500ccbaddcc6a9d0963d / e1b89c76f66343d1b495165664647317c66764bb, ticket/8276 +CVE-2020-22031, da3d6068f3fbbe89c57b6c68c178a54dee168d95 / 0e68e8c93f9068596484ec8ba725586860e06fc8, ticket/8243 +CVE-2020-22032, ac5a7d5a67afb6b26460412d51f026ecf22c2193 / de598f82f8c3f8000e1948548e8088148e2b1f44, ticket/8275 +CVE-2020-22034, f1fc3fe3179109328229421451e3219de1ab9521 / 1331e001796c656a4a3c770a16121c15ec1db2ac, ticket/8236 +CVE-2020-22035, 8c9ff740a35d6f46935f70e4a9533dddaaf33788 / 0749082eb93ea02fa4b770da86597450cec84054, ticket/8262 +CVE-2020-22036, d7490ef341e253294aa0abf1e4ed8381c1b0ea91 / 8c3166e1c302c3ba80d9742ae46161c0fa8e2606, ticket/8261 +</pre> + +<h3>4.1.7</h3> +<p> +Fixes following vulnerabilities: +</p> +<pre> +CVE-2020-22037, 51292064a2ce71b2adfc090ed7302b0ed3f0eab9 / 7bba0dd6382e30d646cb406034a66199e071d713, ticket/8281 +CVE-2020-35965, 40f056abed4e0b0bc8e037da8b56bcb93d5660f2 / 3e5959b3457f7f1856d997261e6ac672bba49e8b +CVE-2021-38114, ff3ae6999959150ef488b170bbcc2fb6610b3572 / 7150f9575671f898382c370acae35f9087a30ba1 +CVE-2021-38171, db3dd0545cdf690ee22f8b9807096d580bb8eb24 / 9ffa49496d1aae4cbbb387aac28a9e061a6ab0a6 +CVE-2021-38291, dfb9a3f7f3ca35eb2dbedb79d117bf14a796e709 / e01d306c647b5827102260b885faa223b646d2d1, ticket/9312 +</pre> + <h3>4.1.6</h3> <p> Fixes following vulnerabilities: @@ -279,6 +361,18 @@ CVE-2018-10001, 47b7c68ae54560e2308bdb6be4fb076c73b93081 <h2>FFmpeg 3.4</h2> +<h3>3.4.9</h3> +<p> +Fixes following vulnerabilities: +</p> +<pre> +CVE-2020-22037, 071ecaddb9ce7a514f4fe8b0ab4bc363d4bb0a38 / 7bba0dd6382e30d646cb406034a66199e071d713, ticket/8281 +CVE-2020-35965, 00115573e3030eff57847e1045ec18f0da5adb5c / 3e5959b3457f7f1856d997261e6ac672bba49e8b +CVE-2021-38114, e61b25e2557394e640a5aae901473785a4b23db5 / 7150f9575671f898382c370acae35f9087a30ba1 +CVE-2021-38171, bc9e0b6cd2839acbac8da3232d715eb66857e453 / 9ffa49496d1aae4cbbb387aac28a9e061a6ab0a6 +CVE-2021-38291, a4a3fd814aac900175ec4a2811cb5bf98c1ddad3 / e01d306c647b5827102260b885faa223b646d2d1, ticket/9312 +</pre> + <h3>3.4.8</h3> <p> Fixes following vulnerabilities: @@ -495,6 +589,19 @@ CVE-2017-7866, e371f031b942d73e02c090170975561fabd5c264 <h2>FFmpeg 3.2</h2> +<h3>3.2.16</h3> +<p> +Fixes following vulnerabilities: +</p> +<pre> +CVE-2019-17539, cb456b8fb00e04bedf117cb4b72c87a9c3db5145 / 8df6884832ec413cf032dfaa45c23b1c7876670c +CVE-2020-22037, 492318cb65967ff220ad84d2034f78c24fbdda54 / 7bba0dd6382e30d646cb406034a66199e071d713, ticket/8281 +CVE-2020-35965, 30102ee94e7d37d0feb11351ee8b70c3f714af66 / 3e5959b3457f7f1856d997261e6ac672bba49e8b +CVE-2021-38114, eeda5a1bd42320d227e52d8b05b37986d143cce3 / 7150f9575671f898382c370acae35f9087a30ba1 +CVE-2021-38171, 8028e18988445e13102d6f65b6f19b6805735698 / 9ffa49496d1aae4cbbb387aac28a9e061a6ab0a6 +CVE-2021-38291, 94551f3197a8570b13830f636c68f3507cd0bb7b / e01d306c647b5827102260b885faa223b646d2d1, ticket/9312 +</pre> + <h3>3.2.15</h3> <p> Fixes following vulnerabilities: @@ -504,6 +611,7 @@ CVE-2019-13390, 9b236547f480a012cab32f8cad2dfe02774537c1 / aef24efb0c1e65097ab77 CVE-2019-17542, 039c13f109a46f8f65adfb65cafa8bdb7123a2a7 / 02f909dc24b1f05cfbba75077c7707b905e63cd2 CVE-2020-13904, 8a2ef6d25dc79d472ea7b184c3b95b4658c99838 / b5e39880fb7269b1b3577cee288e06aa3dc1dfa2 CVE-2020-13904, f80106e256e051082e507496cdaed564adbd4da9 / 9dfb19baeb86a8bb02c53a441682c6e9a6e104cc +CVE-2020-20448, e0983daf05d6c2f53a850619461e74a7392d9bd8 / 8802e329c8317ca5ceb929df48a23eb0f9e852b2, ticket/7990 </pre> <h3>3.2.14</h3> commit 351690137ecb76e7732f77184df4f593bc5159c0 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Sun Oct 24 23:26:04 2021 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Sun Oct 24 23:26:04 2021 +0200 web/download: Add FFmpeg 4.4.1 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/src/download b/src/download index 269abcd..b723674 100644 --- a/src/download +++ b/src/download @@ -304,10 +304,10 @@ gpg: Good signature from "FFmpeg release signing key <ffmpeg-devel(a)ffmpeg.org and much faster bug fixes such as additional features and security patches. </p> - <h3 id="release_4.4">FFmpeg 4.4 "Rao"</h3> + <h3 id="release_4.4">FFmpeg 4.4.1 "Rao"</h3> <p> - 4.4 was released on 2021-04-08. It is the latest stable FFmpeg release + 4.4.1 was released on 2021-10-24. It is the latest stable FFmpeg release from the 4.4 release branch, which was cut from master on 2021-04-08. </p> <p>It includes the following library versions: @@ -323,19 +323,19 @@ libswresample 3. 9.100 libpostproc 55. 9.100</pre> <div class="row"> <div class="col-md-3"> - <a class="btn btn-success" href="releases/ffmpeg-4.4.tar.xz">Download xz tarball</a> - <small><a href="releases/ffmpeg-4.4.tar.xz.asc">PGP signature</a></small> + <a class="btn btn-success" href="releases/ffmpeg-4.4.1.tar.xz">Download xz tarball</a> + <small><a href="releases/ffmpeg-4.4.1.tar.xz.asc">PGP signature</a></small> </div>  <div class="col-md-3"> - <a class="btn btn-success" href="releases/ffmpeg-4.4.tar.bz2">Download bzip2 tarball</a> - <small><a href="releases/ffmpeg-4.4.tar.bz2.asc">PGP signature</a></small> + <a class="btn btn-success" href="releases/ffmpeg-4.4.1.tar.bz2">Download bzip2 tarball</a> + <small><a href="releases/ffmpeg-4.4.1.tar.bz2.asc">PGP signature</a></small> </div>  <div class="col-md-3"> - <a class="btn btn-success" href="releases/ffmpeg-4.4.tar.gz">Download gzip tarball</a> - <small><a href="releases/ffmpeg-4.4.tar.gz.asc">PGP signature</a></small> + <a class="btn btn-success" href="releases/ffmpeg-4.4.1.tar.gz">Download gzip tarball</a> + <small><a href="releases/ffmpeg-4.4.1.tar.gz.asc">PGP signature</a></small> </div>  <div class="col-md-3 text-right"> - <small><a href="https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n4.4">Changelog</a></small> + <small><a href="https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n4.4.1">Changelog</a></small> <a class="btn btn-success" href="https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/4.4:/RELEA…">Release Notes</a> </div>  </div>  ----------------------------------------------------------------------- Summary of changes: src/download | 18 +++++----- src/security | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 9 deletions(-) hooks/post-receive --

1 0

Tag n4.4.1 : FFmpeg 4.4.1 release
by git＠videolan.org 24 Oct '21

24 Oct '21

[ffmpeg] [branch: refs/tags/n4.4.1] Tag: 2aa4f5cc8be5e3168191cd13a61178a167687eac > http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=2aa4f5cc8be5e3168191c… Tagger: Michael Niedermayer <michael(a)niedermayer.cc> Date: Sun Oct 24 22:46:12 2021 +0200 FFmpeg 4.4.1 release

1 0

avfilter/vf_v360: do not reset yaw/pitch/roll with reset_rot true
by Paul B Mahol 24 Oct '21

24 Oct '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Oct 24 14:05:28 2021 +0200| [9df3f147f5a1c11230f3b82fed9524a3ad14a7ae] | committer: Paul B Mahol avfilter/vf_v360: do not reset yaw/pitch/roll with reset_rot true > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9df3f147f5a1c1123… --- libavfilter/vf_v360.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c index 8a27e0fab2..5df273d375 100644 --- a/libavfilter/vf_v360.c +++ b/libavfilter/vf_v360.c @@ -4961,7 +4961,8 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar V360Context *s = ctx->priv; int ret; - s->yaw = s->pitch = s->roll = 0.f; + if (s->reset_rot <= 0) + s->yaw = s->pitch = s->roll = 0.f; if (s->reset_rot < 0) s->reset_rot = 0;

1 0

avfilter/vf_v360: replace deprecated FF_CEIL_RSHIFT()
by Paul B Mahol 24 Oct '21

24 Oct '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Oct 24 14:00:49 2021 +0200| [9353d1a60ffbb1031ba36c0a53d0e2085389b601] | committer: Paul B Mahol avfilter/vf_v360: replace deprecated FF_CEIL_RSHIFT() > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9353d1a60ffbb1031… --- libavfilter/vf_v360.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c index c252a2057a..8a27e0fab2 100644 --- a/libavfilter/vf_v360.c +++ b/libavfilter/vf_v360.c @@ -4254,9 +4254,9 @@ static void fov_from_dfov(int format, float d_fov, float w, float h, float *h_fo static void set_dimensions(int *outw, int *outh, int w, int h, const AVPixFmtDescriptor *desc) { - outw[1] = outw[2] = FF_CEIL_RSHIFT(w, desc->log2_chroma_w); + outw[1] = outw[2] = AV_CEIL_RSHIFT(w, desc->log2_chroma_w); outw[0] = outw[3] = w; - outh[1] = outh[2] = FF_CEIL_RSHIFT(h, desc->log2_chroma_h); + outh[1] = outh[2] = AV_CEIL_RSHIFT(h, desc->log2_chroma_h); outh[0] = outh[3] = h; }

1 0

avformat/avio{,buf}: introduce public AVIOContext::bytes_{read,written}
by Jan Ekström 24 Oct '21

24 Oct '21

ffmpeg | branch: master | Jan Ekström <jeebjp(a)gmail.com> | Mon Oct 18 00:35:48 2021 +0300| [682bafdb12507ec8b049ecbbe2e48bf814927002] | committer: Jan Ekström avformat/avio{,buf}: introduce public AVIOContext::bytes_{read,written} Such fields can be seen as generally useful in cases where the API user is not implementing custom AVIO callbacks, but still would like to know if data is being read or written out, such as in case data is being read from input but no AVPacket has been received yet. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=682bafdb12507ec8b… --- doc/APIchanges | 3 +++ libavformat/avio.h | 14 +++++++++++++- libavformat/avio_internal.h | 5 +++++ libavformat/aviobuf.c | 10 ++++++++-- libavformat/version.h | 2 +- 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 4731e14cb1..99e185ee4e 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2021-10-18 - xxxxxxxxxx - lavf 59.8.100 - avio.h + Introduce public bytes_{read,written} statistic fields to AVIOContext. + 2021-10-13 - xxxxxxxxxx - lavf 59.7.100 - avio.h Deprecate AVIOContext.written. Originally added as a private entry in commit 3f75e5116b900f1428aa13041fc7d6301bf1988a, its grouping with diff --git a/libavformat/avio.h b/libavformat/avio.h index 5e60c2e35c..cd63322a62 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -292,7 +292,9 @@ typedef struct AVIOContext { #if FF_API_AVIOCONTEXT_WRITTEN /** - * @deprecated field utilized privately by libavformat. + * @deprecated field utilized privately by libavformat. For a public + * statistic of how many bytes were written out, see + * AVIOContext::bytes_written. */ attribute_deprecated int64_t written; @@ -303,6 +305,16 @@ typedef struct AVIOContext { * used keeping track of already written data for a later flush. */ unsigned char *buf_ptr_max; + + /** + * Read-only statistic of bytes read for this AVIOContext. + */ + int64_t bytes_read; + + /** + * Read-only statistic of bytes written for this AVIOContext. + */ + int64_t bytes_written; } AVIOContext; /** diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index 467e80701f..187433f283 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -51,6 +51,11 @@ typedef struct FFIOContext { */ int64_t bytes_read; + /** + * Bytes written statistic + */ + int64_t bytes_written; + /** * seek statistic */ diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index f21f1c89df..5da4dea7b6 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -169,6 +169,9 @@ static void writeout(AVIOContext *s, const uint8_t *data, int len) if (ret < 0) { s->error = ret; } else { + ctx->bytes_written += len; + s->bytes_written = ctx->bytes_written; + if (s->pos + len > ctx->written_output_size) { ctx->written_output_size = s->pos + len; #if FF_API_AVIOCONTEXT_WRITTEN @@ -584,6 +587,7 @@ static void fill_buffer(AVIOContext *s) s->buf_ptr = dst; s->buf_end = dst + len; ffiocontext(s)->bytes_read += len; + s->bytes_read = ffiocontext(s)->bytes_read; } } @@ -657,6 +661,7 @@ int avio_read(AVIOContext *s, unsigned char *buf, int size) } else { s->pos += len; ffiocontext(s)->bytes_read += len; + s->bytes_read = ffiocontext(s)->bytes_read; size -= len; buf += len; // reset the buffer @@ -1236,8 +1241,9 @@ int avio_close(AVIOContext *s) av_freep(&s->buffer); if (s->write_flag) - av_log(s, AV_LOG_VERBOSE, "Statistics: %d seeks, %d writeouts\n", - ctx->seek_count, ctx->writeout_count); + av_log(s, AV_LOG_VERBOSE, + "Statistics: %"PRId64" bytes written, %d seeks, %d writeouts\n", + ctx->bytes_written, ctx->seek_count, ctx->writeout_count); else av_log(s, AV_LOG_VERBOSE, "Statistics: %"PRId64" bytes read, %d seeks\n", ctx->bytes_read, ctx->seek_count); diff --git a/libavformat/version.h b/libavformat/version.h index de780124c7..81ed517609 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 59 -#define LIBAVFORMAT_VERSION_MINOR 7 +#define LIBAVFORMAT_VERSION_MINOR 8 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

1 0

avformat/avio{,buf}: deprecate AVIOContext::written
by Jan Ekström 24 Oct '21

24 Oct '21

ffmpeg | branch: master | Jan Ekström <jeebjp(a)gmail.com> | Wed Oct 13 23:05:40 2021 +0300| [a5622ed16f8e22a80cecd8936799e61f61a74cd5] | committer: Jan Ekström avformat/avio{,buf}: deprecate AVIOContext::written Originally added as a private entry in commit 3f75e5116b900f1428aa13041fc7d6301bf1988a, but its grouping with the comment noting its private state was missed during merging of the field from Libav (most likely due to an already existing field in between). > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a5622ed16f8e22a80… --- doc/APIchanges | 6 ++++++ libavformat/avio.h | 6 ++++++ libavformat/aviobuf.c | 9 +++++++++ libavformat/version.h | 5 ++++- 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 7b267a79ac..4731e14cb1 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,12 @@ libavutil: 2021-04-27 API changes, most recent first: +2021-10-13 - xxxxxxxxxx - lavf 59.7.100 - avio.h + Deprecate AVIOContext.written. Originally added as a private entry in + commit 3f75e5116b900f1428aa13041fc7d6301bf1988a, its grouping with + the comment noting its private state was missed during merging of the field + from Libav (most likely due to an already existing field in between). + 2021-09-21 - xxxxxxxxxx - lavu 57.7.100 - pixfmt.h Add AV_PIX_FMT_X2BGR10. diff --git a/libavformat/avio.h b/libavformat/avio.h index a7b56ab667..5e60c2e35c 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -290,7 +290,13 @@ typedef struct AVIOContext { */ int ignore_boundary_point; +#if FF_API_AVIOCONTEXT_WRITTEN + /** + * @deprecated field utilized privately by libavformat. + */ + attribute_deprecated int64_t written; +#endif /** * Maximum reached position before a backward seek in the write buffer, diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index b18a56ef19..f21f1c89df 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -22,6 +22,7 @@ #include "libavutil/bprint.h" #include "libavutil/crc.h" #include "libavutil/dict.h" +#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "libavutil/opt.h" @@ -124,7 +125,11 @@ void ffio_init_context(FFIOContext *ctx, ctx->current_type = AVIO_DATA_MARKER_UNKNOWN; ctx->last_time = AV_NOPTS_VALUE; ctx->short_seek_get = NULL; +#if FF_API_AVIOCONTEXT_WRITTEN +FF_DISABLE_DEPRECATION_WARNINGS s->written = 0; +FF_ENABLE_DEPRECATION_WARNINGS +#endif } AVIOContext *avio_alloc_context( @@ -166,7 +171,11 @@ static void writeout(AVIOContext *s, const uint8_t *data, int len) } else { if (s->pos + len > ctx->written_output_size) { ctx->written_output_size = s->pos + len; +#if FF_API_AVIOCONTEXT_WRITTEN +FF_DISABLE_DEPRECATION_WARNINGS s->written = ctx->written_output_size; +FF_ENABLE_DEPRECATION_WARNINGS +#endif } } } diff --git a/libavformat/version.h b/libavformat/version.h index d5dd22059b..de780124c7 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 59 -#define LIBAVFORMAT_VERSION_MINOR 6 +#define LIBAVFORMAT_VERSION_MINOR 7 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ @@ -61,6 +61,9 @@ #ifndef FF_API_COMPUTE_PKT_FIELDS2 #define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60) #endif +#ifndef FF_API_AVIOCONTEXT_WRITTEN +#define FF_API_AVIOCONTEXT_WRITTEN (LIBAVFORMAT_VERSION_MAJOR < 60) +#endif #ifndef FF_API_R_FRAME_RATE

1 0

avformat/avio: privatize source of truth for AVIOContext::written
by Jan Ekström 24 Oct '21

24 Oct '21

ffmpeg | branch: master | Jan Ekström <jeebjp(a)gmail.com> | Wed Oct 13 22:21:51 2021 +0300| [d39b58dc32b5fc7b480eeb9ef00a610732f02c2c] | committer: Jan Ekström avformat/avio: privatize source of truth for AVIOContext::written Looking at 3f75e5116b900f1428aa13041fc7d6301bf1988a, the field was supposed to be private, but during merging the field and the group that had the comment about it got separated. Thus, move the actual privately utilized state of this variable into the private FFIOContext. Additionally, name the private field somewhat better, so that it does not get confused with the amount of bytes written out. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d39b58dc32b5fc7b4… --- libavformat/avio_internal.h | 6 ++++++ libavformat/aviobuf.c | 11 +++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index eded38759b..467e80701f 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -66,6 +66,12 @@ typedef struct FFIOContext { * used after probing to ensure seekback and to reset the buffer size */ int orig_buffer_size; + + /** + * Written output size + * is updated each time a successful writeout ends up further position-wise + */ + int64_t written_output_size; } FFIOContext; static av_always_inline FFIOContext *ffiocontext(AVIOContext *ctx) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 3d87d66091..b18a56ef19 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -164,8 +164,10 @@ static void writeout(AVIOContext *s, const uint8_t *data, int len) if (ret < 0) { s->error = ret; } else { - if (s->pos + len > s->written) - s->written = s->pos + len; + if (s->pos + len > ctx->written_output_size) { + ctx->written_output_size = s->pos + len; + s->written = ctx->written_output_size; + } } } if (ctx->current_type == AVIO_DATA_MARKER_SYNC_POINT || @@ -337,13 +339,14 @@ int64_t avio_skip(AVIOContext *s, int64_t offset) int64_t avio_size(AVIOContext *s) { + FFIOContext *const ctx = ffiocontext(s); int64_t size; if (!s) return AVERROR(EINVAL); - if (s->written) - return s->written; + if (ctx->written_output_size) + return ctx->written_output_size; if (!s->seek) return AVERROR(ENOSYS);

1 0

Changelog: update
by Michael Niedermayer 23 Oct '21

23 Oct '21

ffmpeg | branch: release/4.4 | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Oct 23 23:31:29 2021 +0200| [7e0d640edf6c3eee1816b105c2f7498c4f948e74] | committer: Michael Niedermayer Changelog: update Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7e0d640edf6c3eee1… --- Changelog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Changelog b/Changelog index f0cc8a0d1f..a6508cd8ac 100644 --- a/Changelog +++ b/Changelog @@ -2,6 +2,21 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. version 4.4.1: +- avcodec/flac_parser: Consider AV_INPUT_BUFFER_PADDING_SIZE +- avcodec/ttadsp: Fix integer overflows in tta_filter_process_c() +- avutil/mathematics: Document av_rescale_rnd() behavior on non int64 results +- avcodec/utils: Ensure 8x8 alignment for ARGO in avcodec_align_dimensions2() +- avformat/matroskadec: Reset state also on failure in matroska_reset_status() +- avformat/wavdec: Check smv_block_size +- avformat/rmdec: Check for multiple audio_stream_info +- avcodec/apedec: Use 64bit to avoid overflow +- avcodec/apedec: Fix undefined integer overflow in long_filter_ehigh_3830() +- oavformat/avidec: Check offset in odml +- avformat/mpegts: use actually read packet size in mpegts_resync special case +- fftools/ffmpeg: Fix crash when flushing non-fully setup output stream +- avfilter/scale_npp: fix non-aligned output frame dimensions +- Revert "avformat/hlsenc: compute video_keyframe_size after write keyframe" +- Changelog: update - swscale/alphablend: Fix slice handling - avcodec/apedec: Fix integer overflow in filter_fast_3320() - avformat/mov: Fix last mfra check

1 0

avcodec/flac_parser: Consider AV_INPUT_BUFFER_PADDING_SIZE
by Michael Niedermayer 23 Oct '21

23 Oct '21

ffmpeg | branch: release/4.4 | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Oct 21 13:25:59 2021 +0200| [73e60e44391d0e7b8bc6a24a177fa0d4efe6f5f7] | committer: Michael Niedermayer avcodec/flac_parser: Consider AV_INPUT_BUFFER_PADDING_SIZE Fixes: out if array read Fixes: 40109/clusterfuzz-testcase-minimized-ffmpeg_dem_FLAC_fuzzer-4805686811295744 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Mattias Wadman <mattias.wadman(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73e60e44391d0e7b8… --- libavcodec/flac_parser.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c index 3424583c49..b13b3b646a 100644 --- a/libavcodec/flac_parser.c +++ b/libavcodec/flac_parser.c @@ -55,6 +55,7 @@ /** largest possible size of flac header */ #define MAX_FRAME_HEADER_SIZE 16 +#define MAX_FRAME_VERIFY_SIZE (MAX_FRAME_HEADER_SIZE) typedef struct FLACHeaderMarker { int offset; /**< byte offset from start of FLACParseContext->buffer */ @@ -170,7 +171,7 @@ static int find_headers_search_validate(FLACParseContext *fpc, int offset) uint8_t *header_buf; int size = 0; header_buf = flac_fifo_read_wrap(fpc, offset, - MAX_FRAME_HEADER_SIZE, + MAX_FRAME_VERIFY_SIZE + AV_INPUT_BUFFER_PADDING_SIZE, &fpc->wrap_buf, &fpc->wrap_buf_allocated_size); if (frame_header_is_valid(fpc->avctx, header_buf, &fi)) {

1 0