FFmpeg commit logs

Michael Niedermayer | 1 Oct 2011 01:24

mpegvideo: increase emu edge buffer size

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Sat Oct  1 00:58:01 2011 +0200|
[7322483d72d4abefae9f5c08c611f521de7236a5] | committer: Michael Niedermayer

mpegvideo: increase emu edge buffer size
This fixes a crash with 422 H.264

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

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

 libavcodec/mpegvideo.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 9dfd26e..fbcd42c 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
 <at>  <at>  -377,8 +377,8  <at>  <at>  static int init_duplicate_context(MpegEncContext *s, MpegEncContext *base){
     int i;

     // edge emu needs blocksize + filter length - 1 (=17x17 for halfpel / 21x21 for h264)
-    FF_ALLOCZ_OR_GOTO(s->avctx, s->allocated_edge_emu_buffer, (s->width+64)*2*21*2, fail);
//(width + edge + align)*interlaced*MBsize*tolerance
-    s->edge_emu_buffer= s->allocated_edge_emu_buffer + (s->width+64)*2*21;
+    FF_ALLOCZ_OR_GOTO(s->avctx, s->allocated_edge_emu_buffer, (s->width+64)*2*21*2*2, fail);
//(width + edge + align)*interlaced*MBsize*tolerance
+    s->edge_emu_buffer= s->allocated_edge_emu_buffer + (s->width+64)*2*21*2;

      //FIXME should be linesize instead of s->width*2 but that is not known before get_buffer()

(Continue reading)

Michael Niedermayer | 1 Oct 2011 01:24

swr: minor fixes to get planar audio working

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Thu Sep 29 04:53:50 2011 +0200|
[a75b254c74d71414f15764979e718e74cd90f5aa] | committer: Michael Niedermayer

swr: minor fixes to get planar audio working

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

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

 libswresample/swresample.c |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 20a1e64..519cadf 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
 <at>  <at>  -39,10 +39,10  <at>  <at>  static const AVOption options[]={
 {"och", "output channel count", OFFSET(out.ch_count   ), FF_OPT_TYPE_INT, {.dbl=2}, 1, SWR_CH_MAX, 0},
 {"isr",  "input sample rate"  , OFFSET( in_sample_rate), FF_OPT_TYPE_INT, {.dbl=48000}, 1, INT_MAX, 0},
 {"osr", "output sample rate"  , OFFSET(out_sample_rate), FF_OPT_TYPE_INT, {.dbl=48000}, 1, INT_MAX, 0},
-{"ip" ,  "input planar"       , OFFSET( in.planar     ), FF_OPT_TYPE_INT, {.dbl=0},    0,       1, 0},
-{"op" , "output planar"       , OFFSET(out.planar     ), FF_OPT_TYPE_INT, {.dbl=0},    0,       1, 0},
-{"isf",  "input sample format", OFFSET( in_sample_fmt ), FF_OPT_TYPE_INT,
{.dbl=AV_SAMPLE_FMT_S16}, 0, AV_SAMPLE_FMT_NB-1, 0},
-{"osf", "output sample format", OFFSET(out_sample_fmt ), FF_OPT_TYPE_INT,
{.dbl=AV_SAMPLE_FMT_S16}, 0, AV_SAMPLE_FMT_NB-1, 0},
+//{"ip" ,  "input planar"       , OFFSET( in.planar     ), FF_OPT_TYPE_INT, {.dbl=0},    0,       1, 0},
+//{"op" , "output planar"       , OFFSET(out.planar     ), FF_OPT_TYPE_INT, {.dbl=0},    0,       1, 0},
+{"isf",  "input sample format", OFFSET( in_sample_fmt ), FF_OPT_TYPE_INT,

(Continue reading)

Michael Niedermayer | 1 Oct 2011 01:24

swr_test: test planar audio

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Thu Sep 29 04:55:53 2011 +0200|
[17d51938d23c5f60f1ae0f4944724944c1b9dfdd] | committer: Michael Niedermayer

swr_test: test planar audio

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

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

 libswresample/swresample_test.c |   61 +++++++++++++++++++++++++++++++-------
 1 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/libswresample/swresample_test.c b/libswresample/swresample_test.c
index e8683cd..61e1b09 100644
--- a/libswresample/swresample_test.c
+++ b/libswresample/swresample_test.c
 <at>  <at>  -28,7 +28,16  <at>  <at> 

 #define ASSERT_LEVEL 2

-static double get(const void *p, int index, enum AVSampleFormat f){
+static double get(const uint8_t *a[], int ch, int index, int ch_count, enum AVSampleFormat f){
+    const uint8_t *p;
+    if(f>=0x100){
+        f&=0xFF;
+        p= a[ch];
+    }else{
+        p= a[0];
+        index= ch + index*ch_count;

(Continue reading)

Michael Niedermayer | 1 Oct 2011 01:51

oggenc: favor av_freep()

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Sat Oct  1 01:26:55 2011 +0200|
[3b6c0ba382cc261b81f1451366e56a7878d4919a] | committer: Michael Niedermayer

oggenc: favor av_freep()

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

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

 libavformat/oggenc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index 21b3501..a527ab3 100644
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
 <at>  <at>  -516,11 +516,11  <at>  <at>  static int ogg_write_trailer(AVFormatContext *s)
         OGGStreamContext *oggstream = st->priv_data;
         if (st->codec->codec_id == CODEC_ID_FLAC ||
             st->codec->codec_id == CODEC_ID_SPEEX) {
-            av_free(oggstream->header[0]);
-            av_free(oggstream->header[1]);
+            av_freep(&oggstream->header[0]);
+            av_freep(&oggstream->header[1]);
         }
         else
-            av_free(oggstream->header[1]);
+            av_freep(&oggstream->header[1]);
         av_freep(&st->priv_data);

(Continue reading)

Michael Niedermayer | 1 Oct 2011 01:51

avformat_free_context: favor av_freep()

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Sat Oct  1 01:29:30 2011 +0200|
[2a93f28a4b6eef8b93046e0b4e3225f2ff1e7324] | committer: Michael Niedermayer

avformat_free_context: favor av_freep()

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

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

 libavformat/utils.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 0d88991..93a3f69 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
 <at>  <at>  -2713,13 +2713,13  <at>  <at>  void avformat_free_context(AVFormatContext *s)
             av_free_packet(&st->cur_pkt);
         }
         av_dict_free(&st->metadata);
-        av_free(st->index_entries);
-        av_free(st->codec->extradata);
-        av_free(st->codec->subtitle_header);
-        av_free(st->codec);
-        av_free(st->priv_data);
-        av_free(st->info);
-        av_free(st);
+        av_freep(&st->index_entries);
+        av_freep(&st->codec->extradata);

(Continue reading)

Michael Niedermayer | 1 Oct 2011 01:51

swresample: check for invalid sample formats.

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Sat Oct  1 01:39:17 2011 +0200|
[834b3760a7ca112573e813bd6c3573a8c0daf4ed] | committer: Michael Niedermayer

swresample: check for invalid sample formats.

Bug-Found-by: Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni <at> gmx.at>

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

 libswresample/swresample.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 519cadf..7276c7a 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
 <at>  <at>  -144,7 +144,15  <at>  <at>  int swr_init(SwrContext *s){
     s-> in_sample_fmt &= 0xFF;
     s->out_sample_fmt &= 0xFF;

-    //We assume AVOptions checked the various values and the defaults where allowed
+    if(s-> in_sample_fmt >= AV_SAMPLE_FMT_NB){
+        av_log(s, AV_LOG_ERROR, "Requested sample format %s is invalid\n", av_get_sample_fmt_name(s->in_sample_fmt));
+        return AVERROR(EINVAL);
+    }
+    if(s->out_sample_fmt >= AV_SAMPLE_FMT_NB){
+        av_log(s, AV_LOG_ERROR, "Requested sample format %s is invalid\n", av_get_sample_fmt_name(s->out_sample_fmt));
+        return AVERROR(EINVAL);

(Continue reading)

Laurent Aimar | 1 Oct 2011 02:42

Check for corrupted data in avs demuxer.

ffmpeg | branch: master | Laurent Aimar <fenrir <at> videolan.org> | Sat Oct  1 00:44:54 2011 +0200|
[1cce7def0a8eff2e7db294b7d195a0fb1a5043b0] | committer: Michael Niedermayer

Check for corrupted data in avs demuxer.

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

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

 libavformat/avs.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavformat/avs.c b/libavformat/avs.c
index 89b2642..7b90f85 100644
--- a/libavformat/avs.c
+++ b/libavformat/avs.c
 <at>  <at>  -163,6 +163,8  <at>  <at>  static int avs_read_packet(AVFormatContext * s, AVPacket * pkt)
             sub_type = avio_r8(s->pb);
             type = avio_r8(s->pb);
             size = avio_rl16(s->pb);
+            if (size < 4)
+                return AVERROR_INVALIDDATA;
             avs->remaining_frame_size -= size;

             switch (type) {

Laurent Aimar | 1 Oct 2011 02:42

Fix potential pointer arithmetic overflows in the Electronic Arts CMV decoder .

ffmpeg | branch: master | Laurent Aimar <fenrir <at> videolan.org> | Sat Oct  1 00:44:59 2011 +0200|
[e9064c9ce8ed18c3a3aab61e58e663b8f5b0c551] | committer: Michael Niedermayer

Fix potential pointer arithmetic overflows in the Electronic Arts CMV decoder.

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

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

 libavcodec/eacmv.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c
index 76de9c9..a084106 100644
--- a/libavcodec/eacmv.c
+++ b/libavcodec/eacmv.c
 <at>  <at>  -56,7 +56,7  <at>  <at>  static void cmv_decode_intra(CmvContext * s, const uint8_t *buf, const uint8_t *
     unsigned char *dst = s->frame.data[0];
     int i;

-    for (i=0; i < s->avctx->height && buf+s->avctx->width<=buf_end; i++) {
+    for (i=0; i < s->avctx->height && buf_end - buf >= s->avctx->width; i++) {
         memcpy(dst, buf, s->avctx->width);
         dst += s->frame.linesize[0];
         buf += s->avctx->width;
 <at>  <at>  -88,7 +88,7  <at>  <at>  static void cmv_decode_inter(CmvContext * s, const uint8_t *buf, const uint8_t *

     i = 0;
     for(y=0; y<s->avctx->height/4; y++)

(Continue reading)

Laurent Aimar | 1 Oct 2011 02:42

Check for out of bound reads in the Electronic Arts CMV decoder.

ffmpeg | branch: master | Laurent Aimar <fenrir <at> videolan.org> | Sat Oct  1 00:45:01 2011 +0200|
[a5d46235f3f70f0b620f8e54649ece45ecc5b170] | committer: Michael Niedermayer

Check for out of bound reads in the Electronic Arts CMV decoder.

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

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

 libavcodec/eacmv.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c
index 3ac9cda..20ec0a2 100644
--- a/libavcodec/eacmv.c
+++ b/libavcodec/eacmv.c
 <at>  <at>  -158,6 +158,9  <at>  <at>  static int cmv_decode_frame(AVCodecContext *avctx,
     CmvContext *s = avctx->priv_data;
     const uint8_t *buf_end = buf + buf_size;

+    if (buf_end - buf < EA_PREAMBLE_SIZE)
+        return AVERROR_INVALIDDATA;
+
     if (AV_RL32(buf)==MVIh_TAG||AV_RB32(buf)==MVIh_TAG) {
         cmv_process_header(s, buf+EA_PREAMBLE_SIZE, buf_end);
         return buf_size;

Laurent Aimar | 1 Oct 2011 02:42

Fix out of bound reads due to integer overflow in the ADPCM IMA Electronic Arts EACS decoder .

ffmpeg | branch: master | Laurent Aimar <fenrir <at> videolan.org> | Sat Oct  1 00:45:02 2011 +0200|
[346876ec168affe7c21be88d8f1acf1a75cc8409] | committer: Michael Niedermayer

Fix out of bound reads due to integer overflow in the ADPCM IMA Electronic Arts EACS decoder.

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

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

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

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 3cb62e3..cf609e7 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
 <at>  <at>  -641,10 +641,11  <at>  <at>  static int adpcm_decode_frame(AVCodecContext *avctx,
             buf_size -= 128;
         }
         break;
-    case CODEC_ID_ADPCM_IMA_EA_EACS:
+    case CODEC_ID_ADPCM_IMA_EA_EACS: {
+        unsigned header_size = 4 + (8<<st);
         samples_in_chunk = bytestream_get_le32(&src) >> (1-st);

-        if (samples_in_chunk > buf_size-4-(8<<st)) {
+        if (buf_size < header_size || samples_in_chunk > buf_size - header_size) {
             src += buf_size - 4;
             break;

(Continue reading)

Group

gmane.comp.video.ffmpeg.cvs.

Advertisement

Project Web Page

FFmpeg commit logs

Search Archive

Page

1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 147

Articles in period: 1462

October 2011

Language

Change language

Options

Current view: Threads only / Showing only 20 lines / Not hiding cited text.
Change to All messages, whole messages, or hide cited text.

Post a message
NNTP Newsgroup
Classic Gmane web interface
XML

XML

RSS Feed
List Information

About Gmane

Recent entries

[ffmpeg-web] branch master updated. 511f456 web: Remove last year's su (19 Jun 2013)
sonicenc: fix off by 1 error (19 Jun 2013)
sonicenc: dont put multiple assignments per line (19 Jun 2013)
sonicenc: set supported samples formats array (19 Jun 2013)
lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer() (19 Jun 2013)
Merge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpeg (19 Jun 2013)
added start_number parameter to drawtext to permit an offset to n/ fra (19 Jun 2013)
add the start_number offset to var_values[VAR_N] directly, instead of (19 Jun 2013)
ff_gen_search: fix infinite loop (18 Jun 2013)
ff_gen_search: fix limit (18 Jun 2013)
ff_gen_search: make step 64it to prevent hypothetical integer overflow (18 Jun 2013)
doc/decoders: Document libcelt (18 Jun 2013)
Add maintainer for WebVTT demuxer and muxer (18 Jun 2013)
avutil/frame: Try to align width to achive linesize[0] alignment (18 Jun 2013)
lavfi: math typo in interlace filter (18 Jun 2013)
swresample/x86/audio_convert: add emms to CONV (18 Jun 2013)
Revert "vaapi: return early from ff_vaapi_render_picture() without pic (18 Jun 2013)
vaapi: return early from ff_vaapi_render_picture() without picture (18 Jun 2013)
lavfi/src_movie: Use movie_common_init instead individual wrappers (18 Jun 2013)
lavfi/src_movie: Check pointer is not NULL before deref (18 Jun 2013)
lavf: add WebVTT muxer. (17 Jun 2013)

Archives

456	June 2013
1319	May 2013
1187	April 2013
1289	March 2013
1285	February 2013
1420	January 2013
1125	December 2012
1091	November 2012
1464	October 2012
929	September 2012
1015	August 2012
1043	July 2012
1212	June 2012
1081	May 2012
956	April 2012
1265	March 2012
997	February 2012
1286	January 2012
1230	December 2011
1444	November 2011
1462	October 2011
1165	September 2011
590	August 2011
809	July 2011
764	June 2011
1010	May 2011
962	April 2011
394	March 2011
313	February 2011
628	January 2011
422	December 2010
298	November 2010
513	October 2010
487	September 2010
583	August 2010
1191	July 2010
789	June 2010
602	May 2010
386	April 2010
910	March 2010
752	February 2010
1024	January 2010
493	December 2009
434	November 2009
467	October 2009
599	September 2009
305	August 2009
372	July 2009
449	June 2009
512	May 2009
636	April 2009
1108	March 2009
1376	February 2009
719	January 2009
644	December 2008
284	November 2008
452	October 2008
625	September 2008
1072	August 2008
718	July 2008
617	June 2008
719	May 2008
546	April 2008
665	March 2008
909	February 2008
539	January 2008
355	December 2007
346	November 2007
376	October 2007
446	September 2007
690	August 2007
590	July 2007
400	June 2007
446	May 2007
353	April 2007
629	March 2007
495	February 2007
534	January 2007
290	December 2006
504	November 2006
581	October 2006
418	September 2006
395	August 2006
422	July 2006
232	June 2006
179	May 2006
137	April 2006
301	March 2006
304	February 2006
298	January 2006
189	December 2005
75	November 2005
77	October 2005
153	September 2005
100	August 2005
103	July 2005
156	June 2005
239	May 2005
118	April 2005
152	March 2005
106	February 2005
175	January 2005
85	December 2004
119	November 2004
36	October 2004

Design

Zawodny | Right Menu | Left Menu

Your Own Design

Paste the URL of your CSS below. Download CSS template