March 2016 - ffmpeg-cvslog - lists.ffmpeg.org

cfhd: Do not initialize context size
by git＠videolan.org 29 Mar '16

29 Mar '16

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Tue Mar 29 16:03:44 2016 +0200| [7888ae8266d8f721cc443fe3aa627d350ca01204] | committer: Michael Niedermayer cfhd: Do not initialize context size Otherwise probing and stream analisys will report a correct coded size but an empty visible size. Approved by: kieran Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7888ae8266d8f721c… --- libavcodec/cfhd.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index a33cc71..d369568 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -43,8 +43,6 @@ static av_cold int cfhd_decode_init(AVCodecContext *avctx) avctx->bits_per_raw_sample = 10; s->avctx = avctx; - avctx->width = 0; - avctx->height = 0; return ff_cfhd_init_vlcs(s); }

1 0

[ffmpeg-web] branch master updated. 8d5702e web/download: update missed "3.0"
by ffmpeg-cvslog＠ffmpeg.org 29 Mar '16

29 Mar '16

The branch, master has been updated via 8d5702e4957f29b8d390dd5a24208b516cf3c8be (commit) from becfe3335a0d056cc3ddc81b25c6d9254fb39282 (commit) - Log ----------------------------------------------------------------- commit 8d5702e4957f29b8d390dd5a24208b516cf3c8be Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Tue Mar 29 04:39:54 2016 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Tue Mar 29 04:39:54 2016 +0200 web/download: update missed "3.0" diff --git a/src/download b/src/download index 8ef87fd..e3a35e0 100644 --- a/src/download +++ b/src/download @@ -270,7 +270,7 @@ </p> - <h3 id="release_3.0">FFmpeg 3.0 "Einstein"</h3> + <h3 id="release_3.0">FFmpeg 3.0.1 "Einstein"</h3> <p> 3.0.1 was released on 2016-03-29. It is the latest stable FFmpeg release ----------------------------------------------------------------------- Summary of changes: src/download | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

1 0

[ffmpeg-web] branch master updated. becfe33 web/download: add FFmpeg 3.0.1
by ffmpeg-cvslog＠ffmpeg.org 29 Mar '16

29 Mar '16

The branch, master has been updated via becfe3335a0d056cc3ddc81b25c6d9254fb39282 (commit) from f6336ea6805a35c5be12dcfd6db0913d1189b003 (commit) - Log ----------------------------------------------------------------- commit becfe3335a0d056cc3ddc81b25c6d9254fb39282 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Tue Mar 29 04:37:28 2016 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Tue Mar 29 04:37:28 2016 +0200 web/download: add FFmpeg 3.0.1 diff --git a/src/download b/src/download index c3d53a2..8ef87fd 100644 --- a/src/download +++ b/src/download @@ -1,10 +1,10 @@ <div id="download"> <div class="btn-download-wrapper"> - <a href="http://ffmpeg.org/releases/ffmpeg-3.0.tar.bz2" class="btn btn-success"> + <a href="http://ffmpeg.org/releases/ffmpeg-3.0.1.tar.bz2" class="btn btn-success"> <i class="fa fa-cloud-download"></i> Download - <small>ffmpeg-3.0.tar.bz2</small> + <small>ffmpeg-3.0.1.tar.bz2</small> </a> <br> <a href="#releases">More releases</a> @@ -273,7 +273,7 @@ <h3 id="release_3.0">FFmpeg 3.0 "Einstein"</h3> <p> - 3.0 was released on 2016-02-15. It is the latest stable FFmpeg release + 3.0.1 was released on 2016-03-29. It is the latest stable FFmpeg release from the 3.0 release branch, which was cut from master on 2016-02-14. </p> <p>It includes the following library versions: @@ -291,19 +291,19 @@ libpostproc 54. 0.100</pre> <div class="row"> <div class="col-md-3"> - <a class="btn btn-success" href="releases/ffmpeg-3.0.tar.xz">Download xz tarball</a> - <small><a href="releases/ffmpeg-3.0.tar.xz.asc">PGP signature</a></small> + <a class="btn btn-success" href="releases/ffmpeg-3.0.1.tar.xz">Download xz tarball</a> + <small><a href="releases/ffmpeg-3.0.1.tar.xz.asc">PGP signature</a></small> </div>  <div class="col-md-3"> - <a class="btn btn-success" href="releases/ffmpeg-3.0.tar.bz2">Download bzip2 tarball</a> - <small><a href="releases/ffmpeg-3.0.tar.bz2.asc">PGP signature</a></small> + <a class="btn btn-success" href="releases/ffmpeg-3.0.1.tar.bz2">Download bzip2 tarball</a> + <small><a href="releases/ffmpeg-3.0.1.tar.bz2.asc">PGP signature</a></small> </div>  <div class="col-md-3"> - <a class="btn btn-success" href="releases/ffmpeg-3.0.tar.gz">Download gzip tarball</a> - <small><a href="releases/ffmpeg-3.0.tar.gz.asc">PGP signature</a></small> + <a class="btn btn-success" href="releases/ffmpeg-3.0.1.tar.gz">Download gzip tarball</a> + <small><a href="releases/ffmpeg-3.0.1.tar.gz.asc">PGP signature</a></small> </div>  <div class="col-md-3 text-right"> - <small><a href="http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n3.0">Changelog</a></small> + <small><a href="http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n3.0.1">Changelog</a></small> <a class="btn btn-success" href="http://git.videolan.org/?p=ffmpeg.git;a=blob;f=RELEASE_NOTES;hb=release/3.0">Release Notes</a> </div>  </div>  ----------------------------------------------------------------------- Summary of changes: src/download | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) hooks/post-receive --

1 0

Tag n3.0.1 : FFmpeg 3.0.1 release
by git＠videolan.org 29 Mar '16

29 Mar '16

[ffmpeg] [branch: refs/tags/n3.0.1] Tag: be90ebaef7c0e6e589ebf95aa3efac39cec788d8 > http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=be90ebaef7c0e6e589ebf… Tagger: Michael Niedermayer <michael(a)niedermayer.cc> Date: Tue Mar 29 04:30:14 2016 +0200 FFmpeg 3.0.1 release

1 0

doc/Doxyfile: update for 3.0.1
by git＠videolan.org 29 Mar '16

29 Mar '16

ffmpeg | branch: release/3.0 | Michael Niedermayer <michael(a)niedermayer.cc> | Tue Mar 29 04:25:48 2016 +0200| [fda00aa7749326f02a6ca0a7d9bd9bcda1054071] | committer: Michael Niedermayer doc/Doxyfile: update for 3.0.1 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fda00aa7749326f02… --- doc/Doxyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Doxyfile b/doc/Doxyfile index 07b4d1f..c001ef7 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = FFmpeg # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 3.0 +PROJECT_NUMBER = 3.0.1 # With the PROJECT_LOGO tag one can specify a logo or icon that is included # in the documentation. The maximum height of the logo should not exceed 55

1 0

Changelog: update
by git＠videolan.org 29 Mar '16

29 Mar '16

ffmpeg | branch: release/3.0 | Michael Niedermayer <michael(a)niedermayer.cc> | Tue Mar 29 03:53:36 2016 +0200| [9b1b674ebefd804192c9fcee2457d4e670683e75] | 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=9b1b674ebefd80419… --- Changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog b/Changelog index c0ac96b..7556ada 100644 --- a/Changelog +++ b/Changelog @@ -40,6 +40,8 @@ ffserver&ffm: Fixed issues preventing ffserver write_index and files_size from b postproc: fix unaligned access vc2enc: fix use of uninitialized variables in the rate control system, correctly zero out coefficient array padding aacenc: optimize encoding speed +avcodec/diracdec: check bitstream size related fields for overflows +avcodec/h264_slice: Check PPS more extensively when its not copied version 3.0:

1 0

avcodec/diracdec: check bitstream size related fields for overflows
by git＠videolan.org 29 Mar '16

29 Mar '16

ffmpeg | branch: release/3.0 | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Mar 28 04:01:08 2016 +0200| [00b54d4625b088b40b3547d55b6c990f3c8fd6c9] | committer: Michael Niedermayer avcodec/diracdec: check bitstream size related fields for overflows Fixes segfault Fixes Ticket5333 Regression since bfc8a4dabe5a0154b31128b59dca575010176441 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit 8f2a1990c06df73cf58401c8ba193711eb8947e7) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=00b54d4625b088b40… --- libavcodec/diracdec.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index e530a05..05c7900 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -173,7 +173,7 @@ typedef struct DiracContext { struct { unsigned prefix_bytes; - unsigned size_scaler; + uint64_t size_scaler; } highquality; struct { @@ -826,9 +826,15 @@ static int decode_hq_slice(AVCodecContext *avctx, void *arg) /* Luma + 2 Chroma planes */ for (i = 0; i < 3; i++) { - int length = s->highquality.size_scaler * get_bits(gb, 8); - int bits_left = 8 * length; - int bits_end = get_bits_count(gb) + bits_left; + int64_t length = s->highquality.size_scaler * get_bits(gb, 8); + int64_t bits_left = 8 * length; + int64_t bits_end = get_bits_count(gb) + bits_left; + + if (bits_end >= INT_MAX) { + av_log(s->avctx, AV_LOG_ERROR, "end too far away\n"); + return AVERROR_INVALIDDATA; + } + for (level = 0; level < s->wavelet_depth; level++) { for (orientation = !!level; orientation < 4; orientation++) { decode_subband(s, gb, quants[level][orientation], slice->slice_x, slice->slice_y, bits_end, @@ -848,7 +854,8 @@ static int decode_hq_slice(AVCodecContext *avctx, void *arg) static int decode_lowdelay(DiracContext *s) { AVCodecContext *avctx = s->avctx; - int slice_x, slice_y, bytes = 0, bufsize; + int slice_x, slice_y, bufsize; + int64_t bytes = 0; const uint8_t *buf; DiracSlice *slices; int slice_num = 0; @@ -872,6 +879,11 @@ static int decode_lowdelay(DiracContext *s) if (bytes <= bufsize/8) bytes += buf[bytes] * s->highquality.size_scaler + 1; } + if (bytes >= INT_MAX) { + av_log(s->avctx, AV_LOG_ERROR, "too many bytes\n"); + av_free(slices); + return AVERROR_INVALIDDATA; + } slices[slice_num].bytes = bytes; slices[slice_num].slice_x = slice_x; @@ -1151,6 +1163,10 @@ static int dirac_unpack_idwt_params(DiracContext *s) } else if (s->hq_picture) { s->highquality.prefix_bytes = svq3_get_ue_golomb(gb); s->highquality.size_scaler = svq3_get_ue_golomb(gb); + if (s->highquality.prefix_bytes >= INT_MAX / 8) { + av_log(s->avctx,AV_LOG_ERROR,"too many prefix bytes\n"); + return AVERROR_INVALIDDATA; + } } /* [DIRAC_STD] 11.3.5 Quantisation matrices (low-delay syntax). quant_matrix() */

1 0

avcodec/h264_slice: Check PPS more extensively when its not copied
by git＠videolan.org 29 Mar '16

29 Mar '16

ffmpeg | branch: release/3.0 | Michael Niedermayer <michael(a)niedermayer.cc> | Fri Mar 25 15:29:26 2016 +0100| [26d29f0c3dc200bbbf066f55a90738398b6013be] | committer: Michael Niedermayer avcodec/h264_slice: Check PPS more extensively when its not copied Fixes Ticket5371 Fixes null pointer dereference Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> (cherry picked from commit c50be7a52bc1e8e18a0059e489743ec12a43f257) Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=26d29f0c3dc200bbb… --- libavcodec/h264_slice.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 2131338..0b3e040 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1282,9 +1282,13 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) if (first_slice) { h->pps = *h->pps_buffers[pps_id]; - } else if (h->setup_finished && h->dequant_coeff_pps != pps_id) { - av_log(h->avctx, AV_LOG_ERROR, "PPS changed between slices\n"); - return AVERROR_INVALIDDATA; + } else { + if (h->pps.sps_id != pps->sps_id || + h->pps.transform_8x8_mode != pps->transform_8x8_mode || + (h->setup_finished && h->dequant_coeff_pps != pps_id)) { + av_log(h->avctx, AV_LOG_ERROR, "PPS changed between slices\n"); + return AVERROR_INVALIDDATA; + } } if (pps->sps_id != h->sps.sps_id ||

1 0

avformat/svag: fix division by zero
by git＠videolan.org 29 Mar '16

29 Mar '16

ffmpeg | branch: release/3.0 | James Almer <jamrial(a)gmail.com> | Mon Mar 28 21:34:08 2016 -0300| [7b1e020fc5edbc09774d6fe7857d47d29f157a13] | committer: James Almer avformat/svag: fix division by zero Fixes ticket #5386 Signed-off-by: James Almer <jamrial(a)gmail.com> (cherry picked from commit d5a3578350a3901a26df39df196bb085760ec46f) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b1e020fc5edbc097… --- libavformat/svag.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/svag.c b/libavformat/svag.c index ab7f36c..08fc06b 100644 --- a/libavformat/svag.c +++ b/libavformat/svag.c @@ -48,7 +48,7 @@ static int svag_read_header(AVFormatContext *s) if (st->codec->sample_rate <= 0) return AVERROR_INVALIDDATA; st->codec->channels = avio_rl32(s->pb); - if (st->codec->channels <= 0) + if (st->codec->channels <= 0 || st->codec->channels > 8) return AVERROR_INVALIDDATA; st->duration = size / (16 * st->codec->channels) * 28; align = avio_rl32(s->pb);

1 0

avformat/svag: fix division by zero
by git＠videolan.org 29 Mar '16

29 Mar '16

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Mon Mar 28 21:34:08 2016 -0300| [d5a3578350a3901a26df39df196bb085760ec46f] | committer: James Almer avformat/svag: fix division by zero Fixes ticket #5386 Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5a3578350a3901a2… --- libavformat/svag.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/svag.c b/libavformat/svag.c index ab7f36c..08fc06b 100644 --- a/libavformat/svag.c +++ b/libavformat/svag.c @@ -48,7 +48,7 @@ static int svag_read_header(AVFormatContext *s) if (st->codec->sample_rate <= 0) return AVERROR_INVALIDDATA; st->codec->channels = avio_rl32(s->pb); - if (st->codec->channels <= 0) + if (st->codec->channels <= 0 || st->codec->channels > 8) return AVERROR_INVALIDDATA; st->duration = size / (16 * st->codec->channels) * 28; align = avio_rl32(s->pb);

1 0