August 2014 - ffmpeg-cvslog - lists.ffmpeg.org

[ffmpeg-web] branch master updated. 4a348c0 web/olddownload: add 1.1.14
by ffmpeg-cvslog＠ffmpeg.org 30 Aug '14

30 Aug '14

The branch, master has been updated via 4a348c097f6d9a110a2f4c4541e9afbd7464a9c2 (commit) from f3e787400b0351d08183df183b6497db53ff6a8d (commit) - Log ----------------------------------------------------------------- commit 4a348c097f6d9a110a2f4c4541e9afbd7464a9c2 Author: Michael Niedermayer <michaelni(a)gmx.at> AuthorDate: Sat Aug 30 23:26:47 2014 +0200 Commit: Michael Niedermayer <michaelni(a)gmx.at> CommitDate: Sat Aug 30 23:27:41 2014 +0200 web/olddownload: add 1.1.14 diff --git a/src/olddownload b/src/olddownload index 3707b3d..adf7460 100644 --- a/src/olddownload +++ b/src/olddownload @@ -79,13 +79,13 @@ libpostproc 52. 3.100</pre> </div>  <a name="release_1.1"></a><h3> - FFmpeg 1.1.13 "Fire Flower"</h3> + FFmpeg 1.1.14 "Fire Flower"</h3> <p> - 1.1.13 was released on 2014-08-08. It is the latest stable FFmpeg release + 1.1.14 was released on 2014-08-30. It is the latest stable FFmpeg release from the 1.1 release branch, which was cut from master on 2013-01-06. Amongst lots of other changes, it includes all changes from - ffmpeg-mt, libav master of 2013-01-06, libav 9.14 as of 2014-08-08. + ffmpeg-mt, libav master of 2013-01-06, libav 9.16 as of 2014-08-30. </p> <p>It includes the following library versions: </p> @@ -102,15 +102,15 @@ libpostproc 52. 2.100</pre> <div class="row"> <div class="col-md-4"> - <a class="btn btn-success" href="releases/ffmpeg-1.1.13.tar.bz2">Download bzip2 tarball</a> - <small><a href="releases/ffmpeg-1.1.13.tar.bz2.asc">PGP signature</a></small> + <a class="btn btn-success" href="releases/ffmpeg-1.1.14.tar.bz2">Download bzip2 tarball</a> + <small><a href="releases/ffmpeg-1.1.14.tar.bz2.asc">PGP signature</a></small> </div>  <div class="col-md-4"> - <a class="btn btn-success" href="releases/ffmpeg-1.1.13.tar.gz">Download gzip tarball</a> - <small><a href="releases/ffmpeg-1.1.13.tar.gz.asc">PGP signature</a></small> + <a class="btn btn-success" href="releases/ffmpeg-1.1.14.tar.gz">Download gzip tarball</a> + <small><a href="releases/ffmpeg-1.1.14.tar.gz.asc">PGP signature</a></small> </div>  <div class="col-md-4 text-right"> - <a class="btn btn-success" href="http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n1.1.13">Changelog</a> + <a class="btn btn-success" href="http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n1.1.14">Changelog</a> </div>  </div>  ----------------------------------------------------------------------- Summary of changes: src/olddownload | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) hooks/post-receive --

1 0

Tag n1.1.14 : FFmpeg 1.1.14 release
by git＠videolan.org 30 Aug '14

30 Aug '14

[ffmpeg] [branch: refs/tags/n1.1.14] Tag: e2387d6e421218f04160591c5f38e277faa80cab > http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=e2387d6e421218f041605… Tagger: Michael Niedermayer <michaelni(a)gmx.at> Date: Sat Aug 30 23:22:31 2014 +0200 FFmpeg 1.1.14 release

1 0

alacenc: fix extra bits extraction
by git＠videolan.org 30 Aug '14

30 Aug '14

ffmpeg | branch: release/1.1 | Christophe Gisquet <christophe.gisquet(a)gmail.com> | Sun Aug 17 18:56:45 2014 +0200| [60f94f708414b187724d42e904b1b3aabe24ad85] | committer: Michael Niedermayer alacenc: fix extra bits extraction The raw coded bits are extracted prior to decorrelation, as is correctly performed by the decoder, and not after. Fixes ticket #2768. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 96d217832598da7001bc204706476dd1e37f377e) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60f94f708414b1877… --- libavcodec/alacenc.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c index e92831f..56cbfdc 100644 --- a/libavcodec/alacenc.c +++ b/libavcodec/alacenc.c @@ -395,6 +395,19 @@ static void write_element(AlacEncodeContext *s, init_sample_buffers(s, channels, samples); write_element_header(s, element, instance); + // extract extra bits if needed + if (s->extra_bits) { + uint32_t mask = (1 << s->extra_bits) - 1; + for (j = 0; j < channels; j++) { + int32_t *extra = s->predictor_buf[j]; + int32_t *smp = s->sample_buf[j]; + for (i = 0; i < s->frame_size; i++) { + extra[i] = smp[i] & mask; + smp[i] >>= s->extra_bits; + } + } + } + if (channels == 2) alac_stereo_decorrelation(s); else @@ -420,8 +433,7 @@ static void write_element(AlacEncodeContext *s, uint32_t mask = (1 << s->extra_bits) - 1; for (i = 0; i < s->frame_size; i++) { for (j = 0; j < channels; j++) { - put_bits(pb, s->extra_bits, s->sample_buf[j][i] & mask); - s->sample_buf[j][i] >>= s->extra_bits; + put_bits(pb, s->extra_bits, s->predictor_buf[j][i] & mask); } } }

1 0

avcodec/lcldec: fix decoding of YUV444 sample
by git＠videolan.org 30 Aug '14

30 Aug '14

ffmpeg | branch: release/1.1 | Piotr Bandurski <ami_stuff(a)o2.pl> | Sun Aug 17 18:17:13 2014 +0200| [f3c8a8b087d08019604fd641970b49144cc3dfa2] | committer: Michael Niedermayer avcodec/lcldec: fix decoding of YUV444 sample Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit a3329a09f93455a44ff3c9c64886c4da1f66bcfb) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f3c8a8b087d080196… --- libavcodec/lcldec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index 5708a12..6893018 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -199,7 +199,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac case AV_CODEC_ID_MSZH: switch (c->compression) { case COMP_MSZH: - if (c->imgtype == IMGTYPE_RGB24 && len == width * height * 3) { + if (c->imgtype == IMGTYPE_RGB24 && len == width * height * 3 || + c->imgtype == IMGTYPE_YUV111 && len == width * height * 3) { ; } else if (c->flags & FLAG_MULTITHREAD) { mthread_inlen = AV_RL32(encoded);

1 0

alacenc: increase predictor buffer
by git＠videolan.org 30 Aug '14

30 Aug '14

ffmpeg | branch: release/1.1 | Christophe Gisquet <christophe.gisquet(a)gmail.com> | Sun Aug 17 17:09:13 2014 +0000| [7f7cf051edd3562af199be97864e03bc3e3ceda0] | committer: Michael Niedermayer alacenc: increase predictor buffer This change is almost cosmetical only, and reduces the changes needed to fix the 24bps case. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit c0d18cc085b13cdfb05ea90a20b46235fb4fa0a9) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f7cf051edd3562af… --- libavcodec/alacenc.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c index 5354d0b..e92831f 100644 --- a/libavcodec/alacenc.c +++ b/libavcodec/alacenc.c @@ -67,7 +67,7 @@ typedef struct AlacEncodeContext { int write_sample_size; int extra_bits; int32_t sample_buf[2][DEFAULT_FRAME_SIZE]; - int32_t predictor_buf[DEFAULT_FRAME_SIZE]; + int32_t predictor_buf[2][DEFAULT_FRAME_SIZE]; int interlacing_shift; int interlacing_leftweight; PutBitContext pbctx; @@ -254,13 +254,14 @@ static void alac_linear_predictor(AlacEncodeContext *s, int ch) { int i; AlacLPCContext lpc = s->lpc[ch]; + int32_t *residual = s->predictor_buf[ch]; if (lpc.lpc_order == 31) { - s->predictor_buf[0] = s->sample_buf[ch][0]; + residual[0] = s->sample_buf[ch][0]; for (i = 1; i < s->frame_size; i++) { - s->predictor_buf[i] = s->sample_buf[ch][i ] - - s->sample_buf[ch][i - 1]; + residual[i] = s->sample_buf[ch][i ] - + s->sample_buf[ch][i - 1]; } return; @@ -270,7 +271,6 @@ static void alac_linear_predictor(AlacEncodeContext *s, int ch) if (lpc.lpc_order > 0) { int32_t *samples = s->sample_buf[ch]; - int32_t *residual = s->predictor_buf; // generate warm-up samples residual[0] = samples[0]; @@ -314,11 +314,11 @@ static void alac_linear_predictor(AlacEncodeContext *s, int ch) } } -static void alac_entropy_coder(AlacEncodeContext *s) +static void alac_entropy_coder(AlacEncodeContext *s, int ch) { unsigned int history = s->rc.initial_history; int sign_modifier = 0, i, k; - int32_t *samples = s->predictor_buf; + int32_t *samples = s->predictor_buf[ch]; for (i = 0; i < s->frame_size;) { int x; @@ -433,10 +433,11 @@ static void write_element(AlacEncodeContext *s, // TODO: determine when this will actually help. for now it's not used. if (prediction_type == 15) { // 2nd pass 1st order filter + int32_t *residual = s->predictor_buf[channels]; for (j = s->frame_size - 1; j > 0; j--) - s->predictor_buf[j] -= s->predictor_buf[j - 1]; + residual[j] -= residual[j - 1]; } - alac_entropy_coder(s); + alac_entropy_coder(s, i); } } }

1 0

wavpack: report if there is no bits left
by git＠videolan.org 30 Aug '14

30 Aug '14

ffmpeg | branch: release/1.1 | Christophe Gisquet <christophe.gisquet(a)gmail.com> | Tue Aug 19 12:26:47 2014 +0000| [3231e7ab64efaf073037f2bab08f0e8b1f0116d0] | committer: Michael Niedermayer wavpack: report if there is no bits left Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 11a39bdf534a4ead634b4a593c66ebf756910b9b) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3231e7ab64efaf073… --- libavcodec/wavpack.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 36f3ad7..2493089 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -398,6 +398,10 @@ static int wv_get_value(WavpackFrameContext *ctx, GetBitContext *gb, return sign ? ~ret : ret; error: + ret = get_bits_left(gb); + if (ret <= 0) { + av_log(ctx->avctx, AV_LOG_ERROR, "Too few bits (%d) left\n", ret); + } *last = 1; return 0; }

1 0

avcodec/adpcm: Fix incorrect AVSampleFormat for sample_fmts_s16p
by git＠videolan.org 30 Aug '14

30 Aug '14

ffmpeg | branch: release/1.1 | Jon Morley <jon(a)tweaksoftware.com> | Tue Aug 19 11:17:49 2014 -0700| [552fe9b07f6b0cd6879869e1b4a17e9293fbd5a5] | committer: Michael Niedermayer avcodec/adpcm: Fix incorrect AVSampleFormat for sample_fmts_s16p The AVSampleFormat list of sample_fmts_s16p is missing the trailing "P" for planar formats. AV_SAMPLE_FMT_S16 vs AV_SAMPLE_FMT_S16P Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 18e70006e7d39f256079cd461a0fe75f1e9cbfd2) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=552fe9b07f6b0cd68… --- libavcodec/adpcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index cd68257..40ead43 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1387,7 +1387,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, static const enum AVSampleFormat sample_fmts_s16[] = { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }; -static const enum AVSampleFormat sample_fmts_s16p[] = { AV_SAMPLE_FMT_S16, +static const enum AVSampleFormat sample_fmts_s16p[] = { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }; static const enum AVSampleFormat sample_fmts_both[] = { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P,

1 0

version.sh: Print versions based on the last git tag for release branches
by git＠videolan.org 30 Aug '14

30 Aug '14

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni(a)gmx.at> | Mon Jul 28 02:40:35 2014 +0200| [3ed4dc92284cfa1ce06e5af4458fdd374b3ca43d] | committer: Michael Niedermayer version.sh: Print versions based on the last git tag for release branches release branches are detected by checking if "git" is not in RELEASE This changes "N-64706-g2f71aeb" to "n2.3-8-g2f71aeb" for git master theres no change This should improve the readability of lists of versions which come from more than 1 release branch or master + release. fate.ffmpeg.org is one possible example Reviewed-by: Timothy Gu <timothygu99(a)gmail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit ee606fd0317df202b59946cf9b738c0a01056316) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 1f4d779e87050111f831f24645580f04e0b1917b) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 0a64e9a0299b8ded2508be4c6f4949f8f8f57724) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ed4dc92284cfa1ce… --- version.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/version.sh b/version.sh index 8d084c2..2309176 100755 --- a/version.sh +++ b/version.sh @@ -2,7 +2,11 @@ # check for git short hash if ! test "$revision"; then - revision=$(cd "$1" && git describe --tags --match N 2> /dev/null) + if (cd "$1" && grep git RELEASE 2> /dev/null >/dev/null) ; then + revision=$(cd "$1" && git describe --tags --match N 2> /dev/null) + else + revision=$(cd "$1" && git describe --tags --always 2> /dev/null) + fi fi # Shallow Git clones (--depth) do not have the N tag:

1 0

remove VERSION file
by git＠videolan.org 30 Aug '14

30 Aug '14

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni(a)gmx.at> | Mon Jul 28 02:22:11 2014 +0200| [4ede955d864d6d8163abdf490f8af6cc49154e38] | committer: Michael Niedermayer remove VERSION file it overrides what version.sh prints and thus makes its output from release branches rather useless Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 2f71aeb30161edb5cb0fea5d3080094a22cc3038) Conflicts: VERSION (cherry picked from commit f543d32455a30c7e11206241184dfb16b8a8081c) Conflicts: VERSION (cherry picked from commit 59b2a9ef957ec796ccf457aad263a52bc457b610) Conflicts: VERSION Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ede955d864d6d816… --- VERSION | 1 - 1 file changed, 1 deletion(-) diff --git a/VERSION b/VERSION deleted file mode 100644 index e9bc149..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -1.1.14

1 0

Update for 1.1.14
by git＠videolan.org 30 Aug '14

30 Aug '14

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Aug 30 21:44:13 2014 +0200| [195fcbff2b64f3b8b9e9b8ae7dfe8c192ef1918e] | committer: Michael Niedermayer Update for 1.1.14 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=195fcbff2b64f3b8b… --- RELEASE | 2 +- VERSION | 2 +- doc/Doxyfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RELEASE b/RELEASE index 9ea63db..e9bc149 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -1.1.13 +1.1.14 diff --git a/VERSION b/VERSION index 9ea63db..e9bc149 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.13 +1.1.14 diff --git a/doc/Doxyfile b/doc/Doxyfile index ec41e77..972bcaf 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 = 1.1.13 +PROJECT_NUMBER = 1.1.14 # With the PROJECT_LOGO tag one can specify an logo or icon that is included # in the documentation. The maximum height of the logo should not exceed 55

1 0