gmane.comp.video.ffmpeg.cvs

mov: set block_align for MACE 3:1 and MACE 6:1

Piotr Bandurski — 2013-05-18T14:33:41

ffmpeg | branch: master | Piotr Bandurski <ami_stuff< at >o2.pl> | Sat May 18 15:23:20 2013 +0200| [7baef22fcad378f86bf8e6d2c87d0d587d0830cc] | committer: Michael Niedermayer

mov: set block_align for MACE 3:1 and MACE 6:1

fixes remuxing of audio track from mov to aifc

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>

---

 libavformat/mov.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 389f786..d5e1f89 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
< at >< at > -1549,6 +1549,8 < at >< at > int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
     case AV_CODEC_ID_ADPCM_MS:
     case AV_CODEC_ID_ADPCM_IMA_WAV:
     case AV_CODEC_ID_ILBC:
+    case AV_CODEC_ID_MACE3:
+    case AV_CODEC_ID_MACE6:
         st->codec->block_align = sc->bytes_per_frame;
         break;
     case AV_CODEC_ID_ALAC:

avcodec_align_dimensions2: add missing yuva formats

Michael Niedermayer — 2013-05-18T14:25:44

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Sat May 18 16:19:06 2013 +0200| [5e29e912327e2e2533a7f537d305b8af4339a425] | committer: Michael Niedermayer

avcodec_align_dimensions2: add missing yuva formats

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>

---

 libavcodec/utils.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 2d5bd3b..c6442bb 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
< at >< at > -239,6 +239,18 < at >< at > void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
     case AV_PIX_FMT_YUV444P12BE:
     case AV_PIX_FMT_YUV444P14LE:
     case AV_PIX_FMT_YUV444P14BE:
+    case AV_PIX_FMT_YUVA420P9LE:
+    case AV_PIX_FMT_YUVA420P9BE:
+    case AV_PIX_FMT_YUVA420P10LE:
+    case AV_PIX_FMT_YUVA420P10BE:
+    case AV_PIX_FMT_YUVA422P9LE:
+    case AV_PIX_FMT_YUVA422P9BE:
+    case AV_PIX_FMT_YUVA422P10LE:
+    case AV_PIX_FMT_YUVA422P10BE:
+    case AV_PIX_FMT_YUVA444P9LE:
+    case AV_PIX_F

sws/output: yuv2rgb_write() assert that alpha hasthe correct value in the tables

Michael Niedermayer — 2013-05-18T13:15:20

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Sat May 18 15:08:55 2013 +0200| [e1efacf60bc8100d5075cf682f7d7a2f8f90f285] | committer: Michael Niedermayer

sws/output: yuv2rgb_write() assert that alpha has the correct value in the tables

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>

---

 libswscale/output.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libswscale/output.c b/libswscale/output.c
index c9af23b..6aa3112 100644
--- a/libswscale/output.c
+++ b/libswscale/output.c
< at >< at > -1149,9 +1149,15 < at >< at > yuv2rgb_write(uint8_t *_dest, int i, int Y1, int Y2,
         if (hasAlpha) {
             int sh = (target == AV_PIX_FMT_RGB32_1 || target == AV_PIX_FMT_BGR32_1) ? 0 : 24;
 
+            av_assert2((((r[Y1] + g[Y1] + b[Y1]) >> sh) & 0xFF) == 0);
             dest[i * 2 + 0] = r[Y1] + g[Y1] + b[Y1] + (A1 << sh);
             dest[i * 2 + 1] = r[Y2] + g[Y2] + b[Y2] + (A2 << sh);
         } else {
+#if ASSERT_LEVEL > 1
+            int sh = (target == AV_PIX_FMT_RGB32_1 ||

doc/filters: apply minor fixes to owdenoisedocumentation

Stefano Sabatini — 2013-05-18T12:55:25

ffmpeg | branch: master | Stefano Sabatini <stefasab< at >gmail.com> | Fri May 17 01:00:37 2013 +0200| [d91e44301c92ed6c6c4efc479a3e24437b5cebf3] | committer: Stefano Sabatini

doc/filters: apply minor fixes to owdenoise documentation

---

 doc/filters.texi |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index cf2c1a4..008699e 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
< at >< at > -5215,7 +5215,7 < at >< at > testsrc=s=100x100, split=4 [in0][in1][in2][in3];
 
 < at >section owdenoise
 
-Overcomplete Wavelet denoiser.
+Apply Overcomplete Wavelet denoiser.
 
 The filter accepts the following options:
 
< at >< at > -5226,17 +5226,17 < at >< at > Set depth.
 Larger depth values will denoise lower frequency components more, but
 slow down filtering.
 
-Default is < at >code{8}.
+Must be an int in the range 8-16, default is < at >code{8}.
 
-< at >item luma_strength
+< at >item luma_strength, ls
 Set luma strength.
 
-Default is < at >code{1.0}
+Must be a double value in the range 0-1000, default is < at >code

Escape 130 (RPL) decoder

Eli Friedman — 2013-05-18T12:38:17

ffmpeg | branch: master | Eli Friedman <eli.friedman< at >gmail.com> | Fri Dec 16 21:30:27 2011 +0100| [350914fc8024612f614c0a4f5c8ba5da2d9988e7] | committer: Kostya Shishkov

Escape 130 (RPL) decoder

Some fixes provided by Paul B Mahol <onemda< at >gmail.com>
and Michael Niedermayer <michaelni< at >gmx.at> and me.

Signed-off-by: Diego Biurrun <diego< at >biurrun.de>
Signed-off-by: Kostya Shishkov <kostya.shishkov< at >gmail.com>

---

 Changelog               |    1 +
 doc/general.texi        |    1 +
 libavcodec/Makefile     |    1 +
 libavcodec/allcodecs.c  |    1 +
 libavcodec/avcodec.h    |    1 +
 libavcodec/codec_desc.c |    7 +
 libavcodec/escape130.c  |  356 +++++++++++++++++++++++++++++++++++++++++++++++
 libavcodec/version.h    |    2 +-
 libavformat/rpl.c       |    2 -
 9 files changed, 369 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index 64d8a00..49bb236 100644
--- a/Changelog
+++ b/Changelog
< at >< at > -19,6 +19,7 < at >< at > version 10:
 - Matroska muxer can now put the index at the beginning of the file.
 -

Merge remote-tracking branch 'qatar/master'

Michael Niedermayer — 2013-05-18T12:38:17

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Sat May 18 14:27:07 2013 +0200| [ed0aed09e8a19d255963c21c7aeda18cee3d9422] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Escape 130 (RPL) decoder

Conflicts:
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/codec_desc.c
libavcodec/escape130.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni< at >gmx.at>

---

Merge commit'cebdedca57d95834a8f8098c7b6a322a1163e26b'

Michael Niedermayer — 2013-05-18T11:55:24

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Sat May 18 13:41:25 2013 +0200| [849bb62c2c9afdb1e81f44870645a6990c4ce1fc] | committer: Michael Niedermayer

Merge commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b'

* commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b':
  prores: decode alpha plane when it's present
  avfilter: check a malloc in avfilter_link().

Merged-by: Michael Niedermayer <michaelni< at >gmx.at>

---

prores: decode alpha plane when it's present

Kostya Shishkov — 2013-05-18T11:55:24

ffmpeg | branch: master | Kostya Shishkov <kostya.shishkov< at >gmail.com> | Fri May 17 19:40:35 2013 +0200| [cebdedca57d95834a8f8098c7b6a322a1163e26b] | committer: Kostya Shishkov

prores: decode alpha plane when it's present

---

 libavcodec/proresdec.c |  112 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 103 insertions(+), 9 deletions(-)

diff --git a/libavcodec/proresdec.c b/libavcodec/proresdec.c
index c42e444..0d1eb7a 100644
--- a/libavcodec/proresdec.c
+++ b/libavcodec/proresdec.c
< at >< at > -134,12 +134,21 < at >< at > static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,
     ctx->chroma_factor     = (buf[12] >> 6) & 3;
     ctx->mb_chroma_factor  = ctx->chroma_factor + 2;
     ctx->num_chroma_blocks = (1 << ctx->chroma_factor) >> 1;
+    ctx->alpha_info        = buf[17] & 0xf;
+
+    if (ctx->alpha_info > 2) {
+        av_log(avctx, AV_LOG_ERROR, "Invalid alpha mode %d\n", ctx->alpha_info);
+        return AVERROR_INVALIDDATA;
+    }
+
     switch (ctx->chroma_factor) {
     case 2:

avfilter: check a malloc in avfilter_link().

Anton Khirnov — 2013-05-18T11:55:24

ffmpeg | branch: master | Anton Khirnov <anton< at >khirnov.net> | Mon Apr  1 15:44:21 2013 +0200| [7e2b15c094bb41ede9ce2a208982a20e4dfa26a6] | committer: Anton Khirnov

avfilter: check a malloc in avfilter_link().

Additionally change sizeof(type) into sizeof(var)

---

 libavfilter/avfilter.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 95fc700..b7913a1 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
< at >< at > -87,8 +87,11 < at >< at > int avfilter_link(AVFilterContext *src, unsigned srcpad,
         return AVERROR(EINVAL);
     }
 
-    src->outputs[srcpad] =
-    dst-> inputs[dstpad] = link = av_mallocz(sizeof(AVFilterLink));
+    link = av_mallocz(sizeof(*link));
+    if (!link)
+        return AVERROR(ENOMEM);
+
+    src->outputs[srcpad] = dst->inputs[dstpad] = link;
 
     link->src     = src;
     link->dst     = dst;

Merge commit'bf5b5d2b1561535cc013c12ab8033228bb0d0081'

Michael Niedermayer — 2013-05-18T11:41:00

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Sat May 18 13:31:45 2013 +0200| [d56ced5fbf3c76ebd5c5b015695101c634e53e4a] | committer: Michael Niedermayer

Merge commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081'

* commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081':
  avfilter.c: cosmetics, reformat

Conflicts:
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni< at >gmx.at>

---

avfilter.c: cosmetics, reformat

Anton Khirnov — 2013-05-18T11:40:59

ffmpeg | branch: master | Anton Khirnov <anton< at >khirnov.net> | Mon Apr  1 15:20:22 2013 +0200| [bf5b5d2b1561535cc013c12ab8033228bb0d0081] | committer: Anton Khirnov

avfilter.c: cosmetics, reformat

---

 libavfilter/avfilter.c |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index d5cf78e..95fc700 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
< at >< at > -34,7 +34,8 < at >< at >
 #include "internal.h"
 #include "video.h"
 
-unsigned avfilter_version(void) {
+unsigned avfilter_version(void)
+{
     return LIBAVFILTER_VERSION_INT;
 }
 
< at >< at > -59,13 +60,13 < at >< at > void ff_insert_pad(unsigned idx, unsigned *count, size_t padidx_off,
 
     *pads  = av_realloc(*pads,  sizeof(AVFilterPad)   * (*count + 1));
     *links = av_realloc(*links, sizeof(AVFilterLink*) * (*count + 1));
-    memmove(*pads +idx+1, *pads +idx, sizeof(AVFilterPad)   * (*count-idx));
-    memmove(*links+idx+1, *links+idx, sizeof(AVFilterLink*) * (*count-idx

Merge commit'd79bd6040599ef017dc45d5997fcc959ab1f71f6'

Michael Niedermayer — 2013-05-18T11:15:29

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Sat May 18 13:10:57 2013 +0200| [fb8dde37e4b0d7966194bc614a1040eee902c4e1] | committer: Michael Niedermayer

Merge commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6'

* commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6':
  lavfi: factorize freeing a link

Conflicts:
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni< at >gmx.at>

---

lavfi: factorize freeing a link

Anton Khirnov — 2013-05-18T11:15:28

ffmpeg | branch: master | Anton Khirnov <anton< at >khirnov.net> | Sun Mar 31 17:18:43 2013 +0200| [d79bd6040599ef017dc45d5997fcc959ab1f71f6] | committer: Anton Khirnov

lavfi: factorize freeing a link

---

 libavfilter/avfilter.c |   44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index b9939a0..d5cf78e 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
< at >< at > -428,10 +428,28 < at >< at > int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *in
 }
 #endif
 
+static void free_link(AVFilterLink *link)
+{
+    if (!link)
+        return;
+
+    if (link->src)
+        link->src->outputs[link->srcpad - link->src->output_pads] = NULL;
+    if (link->dst)
+        link->dst->inputs[link->dstpad - link->dst->input_pads] = NULL;
+
+    ff_formats_unref(&link->in_formats);
+    ff_formats_unref(&link->out_formats);
+    ff_formats_unref(&link->in_samplerates);
+    ff_formats_unref(&li

Merge commit'1dd35611433c224e2231ed7ae26b5b560863a3cb'

Michael Niedermayer — 2013-05-18T11:08:12

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Sat May 18 12:46:54 2013 +0200| [dd2eaf57b76033bf5e8d49457088dec60ad3e9a4] | committer: Michael Niedermayer

Merge commit '1dd35611433c224e2231ed7ae26b5b560863a3cb'

* commit '1dd35611433c224e2231ed7ae26b5b560863a3cb':
  vf_format: do not use the AVFilterFormats internals.

Merged-by: Michael Niedermayer <michaelni< at >gmx.at>

---

vf_format: do not use the AVFilterFormats internals.

Anton Khirnov — 2013-05-18T11:08:12

ffmpeg | branch: master | Anton Khirnov <anton< at >khirnov.net> | Sun Mar 31 16:58:49 2013 +0200| [1dd35611433c224e2231ed7ae26b5b560863a3cb] | committer: Anton Khirnov

vf_format: do not use the AVFilterFormats internals.

Use the formats.h API instead.

---

 libavfilter/vf_format.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c
index 7fcc7d6..e1fcc23 100644
--- a/libavfilter/vf_format.c
+++ b/libavfilter/vf_format.c
< at >< at > -83,15 +83,17 < at >< at > static av_cold int init(AVFilterContext *ctx)
 
 static AVFilterFormats *make_format_list(FormatContext *s, int flag)
 {
-    AVFilterFormats *formats;
+    AVFilterFormats *formats = NULL;
     enum AVPixelFormat pix_fmt;
 
-    formats = av_mallocz(sizeof(AVFilterFormats));
-    formats->formats = av_malloc(sizeof(enum AVPixelFormat) * AV_PIX_FMT_NB);
-
     for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++)
-        if (s->listed_pix_fmt_flags[pix_fmt] == flag)
-            formats->for

doc/fate: update server host key fingerprints

Michael Niedermayer — 2013-05-18T10:44:36

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Sat May 18 12:40:10 2013 +0200| [71b7427e9bdda62d5f4cb042c608ad99b1bf28b9] | committer: Michael Niedermayer

doc/fate: update server host key fingerprints

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>

---

 doc/fate.texi |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/fate.texi b/doc/fate.texi
index 28eadfd..cbdaa12 100644
--- a/doc/fate.texi
+++ b/doc/fate.texi
< at >< at > -131,7 +131,12 < at >< at > of the server and to accept its host key. This can usually be achieved by
 running your SSH client manually and killing it after you accepted the key.
 The FATE server's fingerprint is:
 
-  b1:31:c8:79:3f:04:1d:f8:f2:23:26:5a:fd:55:fa:92
+< at >table < at >option
+< at >item RSA
+   d3:f1:83:97:a4:75:2b:a6:fb:d6:e8:aa:81:93:97:51
+< at >item ECDSA
+   76:9f:68:32:04:1e:d5:d4:ec:47:3f:dc:fc:18:17:86
+< at >end table
 
   If you have problems connecting to the FATE server, it may help to try out
 the < at >command{ssh} command with one or more < at >option{

Merge commit'c5ab6088ad7b0dac461fb6757b038f5260e638e5'

Michael Niedermayer — 2013-05-18T10:28:07

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Sat May 18 12:22:13 2013 +0200| [4742edd50e18398160e0400d72d757f2b6f52852] | committer: Michael Niedermayer

Merge commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5'

* commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5':
  af_aformat: cosmetics, fix indentation

Merged-by: Michael Niedermayer <michaelni< at >gmx.at>

---

af_aformat: cosmetics, fix indentation

Anton Khirnov — 2013-05-18T10:28:07

ffmpeg | branch: master | Anton Khirnov <anton< at >khirnov.net> | Sun Mar 31 16:52:26 2013 +0200| [c5ab6088ad7b0dac461fb6757b038f5260e638e5] | committer: Anton Khirnov

af_aformat: cosmetics, fix indentation

---

 libavfilter/af_aformat.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
index 085b4d0..1f11b48 100644
--- a/libavfilter/af_aformat.c
+++ b/libavfilter/af_aformat.c
< at >< at > -114,7 +114,7 < at >< at > static int query_formats(AVFilterContext *ctx)
     AFormatContext *s = ctx->priv;
 
     ff_set_common_formats(ctx, s->formats ? s->formats :
-                                                  ff_all_formats(AVMEDIA_TYPE_AUDIO));
+                                            ff_all_formats(AVMEDIA_TYPE_AUDIO));
     ff_set_common_samplerates(ctx, s->sample_rates ? s->sample_rates :
                                                      ff_all_samplerates());
     ff_set_common_channel_layouts(ctx, s->channel_layouts ? s->channel_layouts :

Merge commit'b01f6041f4260fba053c2f96ce1611ea77e833a0'

Michael Niedermayer — 2013-05-18T09:57:44

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Sat May 18 11:40:38 2013 +0200| [74cb7ef8514846e97b28973f1884ea9d2afbc018] | committer: Michael Niedermayer

Merge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0'

* commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0':
  lavfi: rename AVFilterFormats.format_count to nb_formats

Conflicts:
libavfilter/avfiltergraph.c
libavfilter/filtfmts.c
libavfilter/formats.c

Merged-by: Michael Niedermayer <michaelni< at >gmx.at>

---

lavfi: rename AVFilterFormats.format_count tonb_formats

Anton Khirnov — 2013-05-18T09:57:44

ffmpeg | branch: master | Anton Khirnov <anton< at >khirnov.net> | Sun Mar 31 16:38:07 2013 +0200| [b01f6041f4260fba053c2f96ce1611ea77e833a0] | committer: Anton Khirnov

lavfi: rename AVFilterFormats.format_count to nb_formats

This is more consistent with naming in the rest of Libav.

---

 libavfilter/avfiltergraph.c |   22 +++++++++++-----------
 libavfilter/filtfmts.c      |    4 ++--
 libavfilter/formats.c       |   12 ++++++------
 libavfilter/formats.h       |    2 +-
 libavfilter/vf_format.c     |    2 +-
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 9131026..9e4c407 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
< at >< at > -341,17 +341,17 < at >< at > static int pick_format(AVFilterLink *link)
     if (!link || !link->in_formats)
         return 0;
 
-    link->in_formats->format_count = 1;
+    link->in_formats->nb_formats = 1;
     link->format = link->in_formats->formats[0];
 
     if (link->type == AVMEDIA_T

Merge commit'e27f4b7cbf8a3fde313cfe4b3a1880bf5031e9ae'

Michael Niedermayer — 2013-05-18T09:36:35

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Sat May 18 11:35:03 2013 +0200| [937af7f6d3e71e959028ddc75cb115533f560fbc] | committer: Michael Niedermayer

Merge commit 'e27f4b7cbf8a3fde313cfe4b3a1880bf5031e9ae'

* commit 'e27f4b7cbf8a3fde313cfe4b3a1880bf5031e9ae':
  doxy: don't sort struct members alphabetically

Merged-by: Michael Niedermayer <michaelni< at >gmx.at>

---