Clément Bœsch | 22 May 2013 18:28
Favicon

lavfi: add lut3d filter.

ffmpeg | branch: master | Clément Bœsch <ubitux <at> gmail.com> | Tue May  7 14:48:56 2013 +0200|
[12f51c1f9e9aef19cd2552769db8693e8b5d4e4d] | committer: Clément Bœsch

lavfi: add lut3d filter.

Fixes part of Ticket #2517.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12f51c1f9e9aef19cd2552769db8693e8b5d4e4d
---

 Changelog                |    1 +
 doc/filters.texi         |   36 +++
 libavfilter/Makefile     |    1 +
 libavfilter/allfilters.c |    1 +
 libavfilter/version.h    |    4 +-
 libavfilter/vf_lut3d.c   |  578 ++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 619 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index 2ed6c87..91ab2e1 100644
--- a/Changelog
+++ b/Changelog
 <at>  <at>  -52,6 +52,7  <at>  <at>  version <next>:
 - Escape 130 video decoder
 - FTP protocol support
 - V4L2 output device
+- 3D LUT filter (lut3d)

 
 version 1.2:
(Continue reading)

Michael Niedermayer | 22 May 2013 18:22
Favicon

shorten: fix "off by padding" bug

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Wed May 22 17:39:22 2013 +0200|
[ad22767cb61cdc75541b21154d65fd1ad6351025] | committer: Michael Niedermayer

shorten: fix "off by padding" bug

Fixes array overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni <at> gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad22767cb61cdc75541b21154d65fd1ad6351025
---

 libavcodec/shorten.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index 23c5d7c..3bba10c 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
 <at>  <at>  -437,7 +437,7  <at>  <at>  static int shorten_decode_frame(AVCodecContext *avctx, void *data,
         buf_size       = FFMIN(buf_size, s->max_framesize - s->bitstream_size);
         input_buf_size = buf_size;

-        if (s->bitstream_index + s->bitstream_size + buf_size >
+        if (s->bitstream_index + s->bitstream_size + buf_size + FF_INPUT_BUFFER_PADDING_SIZE >
             s->allocated_bitstream_size) {
             memmove(s->bitstream, &s->bitstream[s->bitstream_index],
                     s->bitstream_size);
(Continue reading)

Ash Hughes | 22 May 2013 15:36
Favicon

Support playing SMV files.

ffmpeg | branch: master | Ash Hughes <ashes-iontach <at> hotmail.com> | Wed May 22 01:16:51 2013 +0000|
[14ec9d2590162f1a922860f1e8c1d635f5ccb65e] | committer: Michael Niedermayer

Support playing SMV files.

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=14ec9d2590162f1a922860f1e8c1d635f5ccb65e
---

 MAINTAINERS             |    2 +
 libavcodec/Makefile     |    1 +
 libavcodec/allcodecs.c  |    1 +
 libavcodec/avcodec.h    |    1 +
 libavcodec/codec_desc.c |    7 ++
 libavcodec/smvjpegdec.c |  187 +++++++++++++++++++++++++++++++++++++++++++++++
 libavformat/wavdec.c    |   34 +++++++--
 7 files changed, 228 insertions(+), 5 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 9f4301d..d316868 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
 <at>  <at>  -217,6 +217,7  <at>  <at>  Codecs:
   s3tc*                                 Ivo van Poorten
   smacker.c                             Kostya Shishkov
   smc.c                                 Mike Melanson
+  smvjpegdec.c                          Ash Hughes
   snow.c                                Michael Niedermayer, Loren Merritt
   sonic.c                               Alex Beregszaszi
(Continue reading)

Michael Niedermayer | 22 May 2013 14:57
Favicon

avienc: Disallow the first frame to be skiped

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Mon May 20 18:58:39 2013 +0200|
[cc0db8cf3042186d8355dcf10be67071cfbbcc5d] | committer: Michael Niedermayer

avienc: Disallow the first frame to be skiped

Fixes Ticket2386

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc0db8cf3042186d8355dcf10be67071cfbbcc5d
---

 libavformat/avienc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index f2fa9dc..3511c81 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
 <at>  <at>  -523,7 +523,7  <at>  <at>  static int avi_write_packet(AVFormatContext *s, AVPacket *pkt)
     int size= pkt->size;

     av_dlog(s, "dts:%s packet_count:%d stream_index:%d\n", av_ts2str(pkt->dts),
avist->packet_count, stream_index);
-    while(enc->block_align==0 && pkt->dts != AV_NOPTS_VALUE && pkt->dts > avist->packet_count &&
enc->codec_id != AV_CODEC_ID_XSUB){
+    while(enc->block_align==0 && pkt->dts != AV_NOPTS_VALUE && pkt->dts > avist->packet_count &&
enc->codec_id != AV_CODEC_ID_XSUB && avist->packet_count){
         AVPacket empty_packet;

(Continue reading)

Martin Storsjö | 22 May 2013 11:24
Favicon

configure: Enable the strtod workaround when building for bionic

ffmpeg | branch: master | Martin Storsjö <martin <at> martin.st> | Tue May 21 11:43:00 2013 +0300|
[5b2b0b912dbcd6ee8b598254b083c58d4847ef02] | committer: Martin Storsjö

configure: Enable the strtod workaround when building for bionic

Signed-off-by: Martin Storsjö <martin <at> martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b2b0b912dbcd6ee8b598254b083c58d4847ef02
---

 configure |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/configure b/configure
index bf511ed..e3cf0b9 100755
--- a/configure
+++ b/configure
 <at>  <at>  -3210,6 +3210,9  <at>  <at>  elif check_func_headers stdlib.h _get_doserrno; then
     check_cpp_condition stdlib.h "defined(_WIN32_WINNT)" || add_cppflags -D_WIN32_WINNT=0x0502
 elif check_cpp_condition stddef.h "defined __KLIBC__"; then
     libc_type=klibc
+elif check_cpp_condition sys/cdefs.h "defined __BIONIC__"; then
+    libc_type=bionic
+    add_compat strtod.o strtod=avpriv_strtod
 fi

 test -n "$libc_type" && enable $libc_type

_______________________________________________
ffmpeg-cvslog mailing list
(Continue reading)

Carl Eugen Hoyos | 22 May 2013 04:40
Favicon

Add a fate test for ProRes Transparency.

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos <at> ag.or.at> | Tue May 21 23:09:19 2013 +0200|
[898268a23b3c168adf44d9b3d70a2f2cbb6edda5] | committer: Carl Eugen Hoyos

Add a fate test for ProRes Transparency.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=898268a23b3c168adf44d9b3d70a2f2cbb6edda5
---

 tests/fate/prores.mak              |    2 ++
 tests/ref/fate/prores-transparency |    5 +++++
 2 files changed, 7 insertions(+)

diff --git a/tests/fate/prores.mak b/tests/fate/prores.mak
index 56568b2..1a3380a 100644
--- a/tests/fate/prores.mak
+++ b/tests/fate/prores.mak
 <at>  <at>  -3,6 +3,7  <at>  <at>  FATE_PRORES = fate-prores-422                                           \
               fate-prores-422_lt                                        \
               fate-prores-422_proxy                                     \
               fate-prores-alpha                                         \
+              fate-prores-transparency                                  \

 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PRORES) += $(FATE_PRORES)
 fate-prores: $(FATE_PRORES)
 <at>  <at>  -12,3 +13,4  <at>  <at>  fate-prores-422_hq:    CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequ
 fate-prores-422_lt:    CMD = framecrc -flags +bitexact -i
$(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_LT.mov -pix_fmt yuv422p10le
 fate-prores-422_proxy: CMD = framecrc -flags +bitexact -i
$(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_Proxy.mov -pix_fmt yuv422p10le
 fate-prores-alpha:     CMD = framecrc -flags +bitexact -i
(Continue reading)

Michael Niedermayer | 22 May 2013 04:21
Favicon

j2kdec & jpeg2000dec: check lengthinc against array size

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Wed May 22 04:05:36 2013 +0200|
[914ab4cd1c59eae10771f2d6a892ec6b6f36b0e2] | committer: Michael Niedermayer

j2kdec & jpeg2000dec: check lengthinc against array size

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni <at> gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=914ab4cd1c59eae10771f2d6a892ec6b6f36b0e2
---

 libavcodec/j2kdec.c      |    4 +++-
 libavcodec/jpeg2000dec.c |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c
index a02b84b..f4b7e3e 100644
--- a/libavcodec/j2kdec.c
+++ b/libavcodec/j2kdec.c
 <at>  <at>  -577,7 +577,9  <at>  <at>  static int decode_packet(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty,
             int xi;
             for (xi = band->prec[precno].xi0; xi < band->prec[precno].xi1; xi++){
                 Jpeg2000Cblk *cblk = band->cblk + yi * cblknw + xi;
-                if (bytestream2_get_bytes_left(&s->g) < cblk->lengthinc)
+                if (   bytestream2_get_bytes_left(&s->g) < cblk->lengthinc
+                    || sizeof(cblk->data) < cblk->lengthinc
+                )
                     return AVERROR(EINVAL);
(Continue reading)

Michael Niedermayer | 22 May 2013 03:24
Favicon

j2k & jpeg2000dec: reset numX/Ytiles if tiles failed allocation

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Wed May 22 03:17:35 2013 +0200|
[17e66c9ff4774e254932d34dade77b1c04139a4f] | committer: Michael Niedermayer

j2k & jpeg2000dec: reset numX/Ytiles if tiles failed allocation

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni <at> gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17e66c9ff4774e254932d34dade77b1c04139a4f
---

 libavcodec/j2kdec.c      |    2 ++
 libavcodec/jpeg2000dec.c |    2 ++
 2 files changed, 4 insertions(+)

diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c
index 22bbb2e..a02b84b 100644
--- a/libavcodec/j2kdec.c
+++ b/libavcodec/j2kdec.c
 <at>  <at>  -957,6 +957,8  <at>  <at>  static int decode_codestream(Jpeg2000DecoderContext *s)
         switch (marker){
         case JPEG2000_SIZ:
             ret = get_siz(s);
+            if (!s->tile)
+                s->numXtiles = s->numYtiles = 0;
             break;
         case JPEG2000_COC:
             ret = get_coc(s, codsty, properties);
(Continue reading)

Michael Niedermayer | 22 May 2013 02:58
Favicon

jpeg2000dec: check TPsot

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Wed May 22 02:31:03 2013 +0200|
[73ffab41959a17650d552dceefbb11e524a430d4] | committer: Michael Niedermayer

jpeg2000dec: check TPsot

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni <at> gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73ffab41959a17650d552dceefbb11e524a430d4
---

 libavcodec/jpeg2000dec.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 4e03e0e..125aacd 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
 <at>  <at>  -432,6 +432,11  <at>  <at>  static int get_sot(Jpeg2000DecoderContext *s, int n)
     /* Read TNSot but not used */
     bytestream2_get_byteu(&s->g);               // TNsot

+    if (TPsot >= FF_ARRAY_ELEMS(s->tile[s->curtileno].tile_part)) {
+        av_log(s->avctx, AV_LOG_ERROR, "TPsot %d too big\n", TPsot);
+        return AVERROR_PATCHWELCOME;
+    }
+
     tp             = s->tile[s->curtileno].tile_part + TPsot;
(Continue reading)

Michael Niedermayer | 22 May 2013 02:44
Favicon

jpeg2000dec & j2kdec: Fix return type of get_sot()

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Wed May 22 02:13:22 2013 +0200|
[f399b33c2bb7a25b0a60d50afc81d5e1967ca35a] | committer: Michael Niedermayer

jpeg2000dec & j2kdec: Fix return type of get_sot()

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f399b33c2bb7a25b0a60d50afc81d5e1967ca35a
---

 libavcodec/j2kdec.c      |    2 +-
 libavcodec/jpeg2000dec.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c
index 893fcd0..22bbb2e 100644
--- a/libavcodec/j2kdec.c
+++ b/libavcodec/j2kdec.c
 <at>  <at>  -435,7 +435,7  <at>  <at>  static int get_qcc(Jpeg2000DecoderContext *s, int n, Jpeg2000QuantStyle *q, uint
 }

 /** get start of tile segment */
-static uint8_t get_sot(Jpeg2000DecoderContext *s)
+static int get_sot(Jpeg2000DecoderContext *s)
 {
     if (bytestream2_get_bytes_left(&s->g) < 8)
         return AVERROR(EINVAL);
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 1778997..4768f7e 100644
--- a/libavcodec/jpeg2000dec.c
(Continue reading)

Michael Niedermayer | 22 May 2013 02:44
Favicon

jpeg2000dec: read and check curtileno

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Wed May 22 02:29:00 2013 +0200|
[fec8783883f789802ba6596ce4c324aa5c040754] | committer: Michael Niedermayer

jpeg2000dec: read and check curtileno

Fixes out of array accesses
Code ported from j2kdec

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni <at> gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fec8783883f789802ba6596ce4c324aa5c040754
---

 libavcodec/jpeg2000dec.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 4768f7e..4e03e0e 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
 <at>  <at>  -416,7 +416,11  <at>  <at>  static int get_sot(Jpeg2000DecoderContext *s, int n)
     if (bytestream2_get_bytes_left(&s->g) < 8)
         return AVERROR(EINVAL);

-    Isot = bytestream2_get_be16u(&s->g);        // Isot
+    s->curtileno = Isot = bytestream2_get_be16u(&s->g);        // Isot
+    if((unsigned)s->curtileno >= s->numXtiles * s->numYtiles){
+        s->curtileno=0;
+        return AVERROR(EINVAL);
(Continue reading)


Gmane