headers
Piotr Bandurski | 1 Jun 2012 02:33
Favicon

sgienc: add a limit for maximum supported resolution

ffmpeg | branch: master | Piotr Bandurski <ami_stuff <at> o2.pl> | Thu May 31 20:10:04 2012 +0200|
[59352cc219c4f933c9a83b45043ec4810c2a51ee] | committer: Michael Niedermayer

sgienc: add a limit for maximum supported resolution

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

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

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

diff --git a/libavcodec/sgienc.c b/libavcodec/sgienc.c
index d35c7ac..8bb0aba 100644
--- a/libavcodec/sgienc.c
+++ b/libavcodec/sgienc.c
 <at>  <at>  -36,6 +36,11  <at>  <at>  static av_cold int encode_init(AVCodecContext *avctx)
 {
     SgiContext *s = avctx->priv_data;

+    if (avctx->width > 65535 || avctx->height > 65535) {
+        av_log(avctx, AV_LOG_ERROR, "SGI does not support resolutions above 65535x65535\n");
+        return -1;
+    }
+
     avcodec_get_frame_defaults(&s->picture);
     avctx->coded_frame = &s->picture;
Permalink | Reply | 1 comment |
headers
Michael Niedermayer | 1 Jun 2012 02:33
Favicon

8svx: fix crash

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Fri Jun  1 01:33:00 2012 +0200|
[03ce421c1361e4ce79468de8269ad51ba2ae4c16] | committer: Michael Niedermayer

8svx: fix crash

Fixes Ticket1377

Found-by: Piotr Bandurski <ami_stuff <at> o2.pl>
Signed-off-by: Michael Niedermayer <michaelni <at> gmx.at>

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

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

diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c
index f42a35b..e220ad1 100644
--- a/libavcodec/8svx.c
+++ b/libavcodec/8svx.c
 <at>  <at>  -47,7 +47,7  <at>  <at>  typedef struct EightSvxContext {
     /* buffer used to store the whole audio decoded/interleaved chunk,
      * which is sent with the first packet */
     uint8_t *samples;
-    size_t samples_size;
+    int64_t samples_size;
     int samples_idx;
 } EightSvxContext;
Permalink | Reply | 4 comments |
headers
Michael Niedermayer | 1 Jun 2012 04:21
Favicon

fate: try to fix 3rd md5 implementation

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Fri Jun  1 03:52:22 2012 +0200|
[abf5f6ea2ab993b266baf4dfd52635ead2b00829] | committer: Michael Niedermayer

fate: try to fix 3rd md5 implementation

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

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

 tests/md5.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/md5.sh b/tests/md5.sh
index 4b95127..e21e5c3 100644
--- a/tests/md5.sh
+++ b/tests/md5.sh
 <at>  <at>  -5,7 +5,7  <at>  <at>  if [ X"$(echo | md5sum 2> /dev/null)" != X ]; then
 elif [ X"$(echo | command md5 2> /dev/null)" != X ]; then
     do_md5sum() { command md5 $1 | sed 's#MD5 (\(.*\)) = \(.*\)#\2 *\1#'; }
 elif [ -x /sbin/md5 ]; then
-    do_md5sum() { /sbin/md5 -r $1 | sed 's# \**\./# *./#'; }
+    do_md5sum() { /sbin/md5 -r $1 | sed 's/\([0-9a-f]\) [ *]*/\1 */'; }
 elif openssl version >/dev/null 2>&1; then
     do_md5sum() { openssl md5 $1 | sed 's/MD5(\(.*\))= \(.*\)/\2 *\1/'; }
 else
Permalink | Reply | 0 comments |
headers
Clément Bœsch | 1 Jun 2012 08:06
Favicon

swr: fix a few typo.

ffmpeg | branch: master | Clément Bœsch <ubitux <at> gmail.com> | Fri Jun  1 08:06:36 2012 +0200|
[64df092b25e671f46fa5cc61ee217adc7cf3ff34] | committer: Clément Bœsch

swr: fix a few typo.

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

 libswresample/swresample.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 38bedf1..dc0b8eb 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
 <at>  <at>  -84,9 +84,9  <at>  <at>  static const AVOption options[]={
                                                         , OFFSET(min_compensation),AV_OPT_TYPE_FLOAT ,{.dbl=FLT_MAX               }, 0      , FLT_MAX   , PARAM },
 {"min_hard_comp"        , "Minimum difference between timestamps and audio data (in seconds) to trigger
padding/trimming the data."
                                                    , OFFSET(min_hard_compensation),AV_OPT_TYPE_FLOAT ,{.dbl=0.1                   }, 0      , INT_MAX   , PARAM },
-{"comp_duration"        , "Duration (in seconds) over which data is stretched/squeezeed to make it match the timestamps."
+{"comp_duration"        , "Duration (in seconds) over which data is stretched/squeezed to make it match the timestamps."
                                               , OFFSET(soft_compensation_duration),AV_OPT_TYPE_FLOAT ,{.dbl=1                     }, 0      , INT_MAX   , PARAM },
-{"max_soft_comp"        , "Maximum factor by which data is stretched/squeezeed to make it match the timestamps."
+{"max_soft_comp"        , "Maximum factor by which data is stretched/squeezed to make it match the timestamps."
                                                    , OFFSET(max_soft_compensation),AV_OPT_TYPE_FLOAT ,{.dbl=0                     }, INT_MIN, INT_MAX   , PARAM },

 {0}
 <at>  <at>  -226,7 +226,7  <at>  <at>  int swr_init(struct SwrContext *s){
         }else if(av_get_planar_sample_fmt(s->in_sample_fmt) <= AV_SAMPLE_FMT_FLTP){
(Continue reading)

Permalink | Reply | 0 comments |
headers
Carl Eugen Hoyos | 1 Jun 2012 09:48
Favicon

Let ffmpeg select the setpts filter.

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos <at> ag.or.at> | Fri Jun  1 09:45:25 2012 +0200|
[aac41ec119a625a2460a47343fe47870a4726916] | committer: Carl Eugen Hoyos

Let ffmpeg select the setpts filter.

Do not disable ffmpeg with --disable-everything.

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

 configure |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 81c7cc1..b91284d 100755
--- a/configure
+++ b/configure
 <at>  <at>  -1709,9 +1709,9  <at>  <at>  avformat_deps="avcodec"
 postproc_deps="gpl"

 # programs
-ffmpeg_deps="avcodec avfilter avformat swscale swresample
-             setpts_filter"
-ffmpeg_select="buffersink_filter format_filter aformat_filter"
+ffmpeg_deps="avcodec avfilter avformat swscale swresample"
+ffmpeg_select="buffersink_filter format_filter aformat_filter
+               setpts_filter"
 ffplay_deps="avcodec avformat swscale swresample sdl"
 ffplay_select="buffersink_filter rdft"
 ffprobe_deps="avcodec avformat"
(Continue reading)

Permalink | Reply | 1 comment |
headers
Michael Niedermayer | 1 Jun 2012 12:20
Favicon

dnxhd: replace asserts by av_asserts

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Fri Jun  1 12:14:03 2012 +0200|
[422418b6641db50e45534fa4c6907a26c1f69098] | committer: Michael Niedermayer

dnxhd: replace asserts by av_asserts

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

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

 libavcodec/dnxhdenc.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index 646d151..68c8007 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
 <at>  <at>  -127,7 +127,7  <at>  <at>  static int dnxhd_init_vlc(DNXHDEncContext *ctx)
                 if (ctx->cid_table->ac_level[j] >> 1 == alevel &&
                     (!offset || (ctx->cid_table->ac_flags[j] & 1) && offset) &&
                     (!run    || (ctx->cid_table->ac_flags[j] & 2) && run)) {
-                    assert(!ctx->vlc_codes[index]);
+                    av_assert1(!ctx->vlc_codes[index]);
                     if (alevel) {
                         ctx->vlc_codes[index] = (ctx->cid_table->ac_codes[j]<<1)|(sign&1);
                         ctx->vlc_bits [index] = ctx->cid_table->ac_bits[j]+1;
 <at>  <at>  -138,7 +138,7  <at>  <at>  static int dnxhd_init_vlc(DNXHDEncContext *ctx)
                     break;
                 }
             }
(Continue reading)

Permalink | Reply | 0 comments |
headers
Michael Niedermayer | 1 Jun 2012 12:20
Favicon

fate: only check stddev for acodec-ra144

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Thu May 31 03:08:56 2012 +0200|
[e6866b1c6702aee5b696c5a49c20edb136e0427c] | committer: Michael Niedermayer

fate: only check stddev for acodec-ra144

ra144 uses floats so bitexactness cannot be guranteed
This should fix a long standing issue with icc

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

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

 tests/fate/acodec.mak       |   12 +++++++-----
 tests/ref/fate/acodec-ra144 |    4 ----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak
index 8937636..3d76e12 100644
--- a/tests/fate/acodec.mak
+++ b/tests/fate/acodec.mak
 <at>  <at>  -68,11 +68,13  <at>  <at>  fate-acodec-g723_1: ENCOPTS = -b:a 6.3k
 fate-acodec-g723_1: CMP_SHIFT = 8

 FATE_ACODEC += fate-acodec-ra144
-fate-acodec-ra144: FMT = rm
-fate-acodec-ra144: CODEC = real_144
-fate-acodec-ra144: ENCOPTS = -ac 1
-fate-acodec-ra144: DECOPTS = -ac 2
-fate-acodec-ra144: CMP_SHIFT = -640
(Continue reading)

Permalink | Reply | 5 comments |
headers
Michael Niedermayer | 1 Jun 2012 12:35
Favicon

ffmpeg: fix memleak

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Fri Jun  1 12:31:13 2012 +0200|
[23b365f1c41a1ac213f2a446aa1557b5939ed749] | committer: Michael Niedermayer

ffmpeg: fix memleak

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

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

 ffmpeg.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/ffmpeg.c b/ffmpeg.c
index 849bd70..f654a2b 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
 <at>  <at>  -1499,6 +1499,7  <at>  <at>  void av_noreturn exit_program(int ret)
         output_streams[i]->bitstream_filters = NULL;

         av_freep(&output_streams[i]->filtered_frame);
+        av_freep(&output_streams[i]->avfilter);
         av_freep(&output_streams[i]);
     }
     for (i = 0; i < nb_input_files; i++) {
Permalink | Reply | 0 comments |
headers
Michael Niedermayer | 1 Jun 2012 14:54
Favicon

log: add category to AVClass

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Mon May 28 12:49:23 2012 +0200|
[5f509fa2e1ee91726a8fcfb8a2877edcc0895f8a] | committer: Michael Niedermayer

log: add category to AVClass

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

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

 libavutil/avutil.h |    2 +-
 libavutil/log.h    |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index acef213..2e83d1f 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
 <at>  <at>  -153,7 +153,7  <at>  <at> 
  */

 #define LIBAVUTIL_VERSION_MAJOR 51
-#define LIBAVUTIL_VERSION_MINOR 55
+#define LIBAVUTIL_VERSION_MINOR 56
 #define LIBAVUTIL_VERSION_MICRO 100

 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
diff --git a/libavutil/log.h b/libavutil/log.h
index 26c806f..ad3c3dd 100644
--- a/libavutil/log.h
(Continue reading)

Permalink | Reply | 0 comments |
headers
Martin Storsjö | 1 Jun 2012 14:54
Favicon

tcp: Check the return values from bind and accept

ffmpeg | branch: master | Martin Storsjö <martin <at> martin.st> | Wed May 30 17:35:05 2012 +0300|
[2dbb8cc6a31b0e5b88e6ca667da097fa785e8917] | committer: Michael Niedermayer

tcp: Check the return values from bind and accept

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

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

 libavformat/tcp.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index db8dba2..a8ebd81 100644
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
 <at>  <at>  -84,8 +84,16  <at>  <at>  static int tcp_open(URLContext *h, const char *uri, int flags)
     if (listen_socket) {
         int fd1;
         ret = bind(fd, cur_ai->ai_addr, cur_ai->ai_addrlen);
+        if (ret) {
+            ret = ff_neterrno();
+            goto fail1;
+        }
         listen(fd, 1);
         fd1 = accept(fd, NULL, NULL);
+        if (fd1 < 0) {
+            ret = ff_neterrno();
+            goto fail1;
(Continue reading)

Permalink | Reply | 0 comments |

Gmane