November 2014 - ffmpeg-cvslog

avcodec/wmaprodec: Fix integer overflow in sfb_offsets initialization
by git＠videolan.org 30 Nov '14

30 Nov '14

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni(a)gmx.at> | Mon Nov 10 23:07:50 2014 +0100| [cfda2a677c25f407fe4a93213e977e4a0106b3ac] | committer: Michael Niedermayer avcodec/wmaprodec: Fix integer overflow in sfb_offsets initialization Fixes out of array read Fixes: asan_heap-oob_2aec5b0_1828_classical_22_16_2_16000_v3c_0_exclusive_0_29.wma Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 5dcb99033df16eccc4dbbc4a099ad64457f9f090) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cfda2a677c25f407f… --- libavcodec/wmaprodec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index f45e1fc..56d6d32 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -422,6 +422,9 @@ static av_cold int decode_init(AVCodecContext *avctx) offset &= ~3; if (offset > s->sfb_offsets[i][band - 1]) s->sfb_offsets[i][band++] = offset; + + if (offset >= subframe_len) + break; } s->sfb_offsets[i][band - 1] = subframe_len; s->num_sfb[i] = band - 1;

1 0

avcodec/mpeg4video_parser: fix spurious extradata parse warnings
by git＠videolan.org 30 Nov '14

30 Nov '14

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Nov 15 17:30:44 2014 +0100| [a3fdc0b35bd78b7f89e8bd76cd7b4e912392d530] | committer: Michael Niedermayer avcodec/mpeg4video_parser: fix spurious extradata parse warnings Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 7d37e45f6bac198bc986aeb987afe219edbbd45a) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a3fdc0b35bd78b7f8… --- libavcodec/mpeg4video_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpeg4video_parser.c b/libavcodec/mpeg4video_parser.c index b7718f6..aa5e87a 100644 --- a/libavcodec/mpeg4video_parser.c +++ b/libavcodec/mpeg4video_parser.c @@ -88,7 +88,7 @@ static int mpeg4_decode_header(AVCodecParserContext *s1, AVCodecContext *avctx, if (avctx->extradata_size && pc->first_picture) { init_get_bits(gb, avctx->extradata, avctx->extradata_size * 8); ret = ff_mpeg4_decode_picture_header(dec_ctx, gb); - if (ret < 0) + if (ret < -1) av_log(avctx, AV_LOG_WARNING, "Failed to parse extradata\n"); }

1 0

lavu/opt: fix av_opt_get function
by git＠videolan.org 30 Nov '14

30 Nov '14

ffmpeg | branch: release/2.4 | Lukasz Marek <lukasz.m.luki2(a)gmail.com> | Tue Nov 11 21:17:58 2014 +0100| [cf8b91a28e9308d49ebc2a107f4a77ac28aeecbc] | committer: Michael Niedermayer lavu/opt: fix av_opt_get function Signed-off-by: Lukasz Marek <lukasz.m.luki2(a)gmail.com> (cherry picked from commit 173d51c982f1ecaa8d28cd0d8611164be0c9d36d) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf8b91a28e9308d49… --- libavutil/opt.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index ee72a96..e9ed765 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -725,6 +725,10 @@ int av_opt_get(void *obj, const char *name, int search_flags, uint8_t **out_val) return AVERROR(EINVAL); if (!(*out_val = av_malloc(len*2 + 1))) return AVERROR(ENOMEM); + if (!len) { + *out_val[0] = '\0'; + return 0; + } bin = *(uint8_t**)dst; for (i = 0; i < len; i++) snprintf(*out_val + i*2, 3, "%02X", bin[i]); @@ -740,12 +744,14 @@ int av_opt_get(void *obj, const char *name, int search_flags, uint8_t **out_val) break; case AV_OPT_TYPE_DURATION: i64 = *(int64_t *)dst; - ret = snprintf(buf, sizeof(buf), "%"PRIi64"d:%02d:%02d.%06d", + ret = snprintf(buf, sizeof(buf), "%"PRIi64":%02d:%02d.%06d", i64 / 3600000000, (int)((i64 / 60000000) % 60), (int)((i64 / 1000000) % 60), (int)(i64 % 1000000)); break; case AV_OPT_TYPE_COLOR: - ret = snprintf(buf, sizeof(buf), "0x%02x%02x%02x%02x", ((int *)dst)[0], ((int *)dst)[1], ((int *)dst)[2], ((int *)dst)[3]); + ret = snprintf(buf, sizeof(buf), "0x%02x%02x%02x%02x", + (int)((uint8_t *)dst)[0], (int)((uint8_t *)dst)[1], + (int)((uint8_t *)dst)[2], (int)((uint8_t *)dst)[3]); break; case AV_OPT_TYPE_CHANNEL_LAYOUT: i64 = *(int64_t *)dst;

1 0

avcodec/options_table fix min of audio channels and sample rate
by git＠videolan.org 30 Nov '14

30 Nov '14

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni(a)gmx.at> | Mon Nov 3 13:20:24 2014 +0100| [f7e9fcda2df158171727d3a5691e22e312f35fdd] | committer: Michael Niedermayer avcodec/options_table fix min of audio channels and sample rate Found-by: Lukasz Marek <lukasz.m.luki2(a)gmail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 206c98f303e833c9e94427c9e3f9867f85265f78) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7e9fcda2df158171… --- libavcodec/options_table.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index ad3d52e..5e79f82 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -105,8 +105,8 @@ static const AVOption avcodec_options[] = { {"extradata_size", NULL, OFFSET(extradata_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, {"time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, {.dbl = 0}, INT_MIN, INT_MAX}, {"g", "set the group of picture (GOP) size", OFFSET(gop_size), AV_OPT_TYPE_INT, {.i64 = 12 }, INT_MIN, INT_MAX, V|E}, -{"ar", "set audio sampling rate (in Hz)", OFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|D|E}, -{"ac", "set number of audio channels", OFFSET(channels), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|D|E}, +{"ar", "set audio sampling rate (in Hz)", OFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A|D|E}, +{"ac", "set number of audio channels", OFFSET(channels), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A|D|E}, {"cutoff", "set cutoff bandwidth", OFFSET(cutoff), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|E}, {"frame_size", NULL, OFFSET(frame_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|E}, {"frame_number", NULL, OFFSET(frame_number), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},

1 0

avcodec/utvideodec: fix assumtation that slice_height >= 1
by git＠videolan.org 30 Nov '14

30 Nov '14

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni(a)gmx.at> | Mon Nov 10 19:44:20 2014 +0100| [11dfd1fa20fae31531a3c085cdcc00089dbcaa5f] | committer: Michael Niedermayer avcodec/utvideodec: fix assumtation that slice_height >= 1 Fixes out of array read Fixes: asan_heap-oob_2573085_3783_utvideo_rgba_median.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 7656c4c6e66f8a787d384f027ad824cc1677fda1) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11dfd1fa20fae3153… --- libavcodec/utvideodec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index afd56ea..05c943f 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -224,7 +224,7 @@ static void restore_median(uint8_t *src, int step, int stride, A = bsrc[i]; } bsrc += stride; - if (slice_height == 1) + if (slice_height <= 1) continue; // second line - first element has top prediction, the rest uses median C = bsrc[-stride]; @@ -284,7 +284,7 @@ static void restore_median_il(uint8_t *src, int step, int stride, A = bsrc[stride + i]; } bsrc += stride2; - if (slice_height == 1) + if (slice_height <= 1) continue; // second line - first element has top prediction, the rest uses median C = bsrc[-stride2];

1 0

lavc/utils: Make pix_fmt desc pointer const.
by git＠videolan.org 30 Nov '14

30 Nov '14

ffmpeg | branch: release/2.4 | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Thu Oct 30 00:27:04 2014 +0100| [2719ba9ee35f2dd1243e67ae85889bcdbc4afe7b] | committer: Michael Niedermayer lavc/utils: Make pix_fmt desc pointer const. Fixes an "initialization discards qualifiers from pointer target type" warning. (cherry picked from commit f05855414ed4cce97c06ba2a31f4987af47e6d4e) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2719ba9ee35f2dd12… --- libavcodec/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 4931444..ca6fe2d 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -279,7 +279,7 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int i; int w_align = 1; int h_align = 1; - AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(s->pix_fmt); + AVPixFmtDescriptor const *desc = av_pix_fmt_desc_get(s->pix_fmt); if (desc) { w_align = 1 << desc->log2_chroma_w;

1 0

libavutil/threads.h: correct an include to be local
by git＠videolan.org 30 Nov '14

30 Nov '14

ffmpeg | branch: release/2.4 | Dave Yeo <dave.r.yeo(a)gmail.com> | Fri Nov 28 23:36:06 2014 -0800| [d48e0aed3c17284f4db71f644bcb5a5646c1cbe8] | committer: Michael Niedermayer libavutil/threads.h: correct an include to be local Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 32eadfe453c32788ea57968e6e80f673f434739d) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d48e0aed3c17284f4… --- libavutil/thread.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/thread.h b/libavutil/thread.h index a004fba..9733661 100644 --- a/libavutil/thread.h +++ b/libavutil/thread.h @@ -31,7 +31,7 @@ #elif HAVE_OS2THREADS #include "compat/os2threads.h" #else -#include <compat/w32pthreads.h> +#include "compat/w32pthreads.h" #endif #define AVMutex pthread_mutex_t

1 0

libavutil/thread.h: Support OS/2 threads
by git＠videolan.org 30 Nov '14

30 Nov '14

ffmpeg | branch: release/2.4 | Dave Yeo <dave.r.yeo(a)gmail.com> | Fri Nov 28 23:34:20 2014 -0800| [89b52d25b4b847f58bab32901064803f79ac68df] | committer: Michael Niedermayer libavutil/thread.h: Support OS/2 threads Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 090a7801a8817c1fbc6db0ed39070bf82255d8f2) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89b52d25b4b847f58… --- libavutil/thread.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavutil/thread.h b/libavutil/thread.h index 62e1340..a004fba 100644 --- a/libavutil/thread.h +++ b/libavutil/thread.h @@ -24,10 +24,12 @@ #include "config.h" -#if HAVE_PTHREADS || HAVE_W32THREADS +#if HAVE_PTHREADS || HAVE_W32THREADS || HAVE_OS2THREADS #if HAVE_PTHREADS #include <pthread.h> +#elif HAVE_OS2THREADS +#include "compat/os2threads.h" #else #include <compat/w32pthreads.h> #endif

1 0

fix Makefile objects for pulseaudio support
by git＠videolan.org 30 Nov '14

30 Nov '14

ffmpeg | branch: release/2.4 | Michael Stypa <michael(a)stypa.info> | Fri Nov 28 15:54:50 2014 +0100| [9984d492dc51249c3f656d50b90c36e7540002f2] | committer: Michael Niedermayer fix Makefile objects for pulseaudio support Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit cb58c771ade66afcc623250e1c7ac8191381d991) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9984d492dc51249c3… --- libavdevice/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavdevice/Makefile b/libavdevice/Makefile index db301e7..d700d9a 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -34,7 +34,7 @@ OBJS-$(CONFIG_OPENGL_OUTDEV) += opengl_enc.o OBJS-$(CONFIG_OSS_INDEV) += oss_audio.o oss_audio_dec.o OBJS-$(CONFIG_OSS_OUTDEV) += oss_audio.o oss_audio_enc.o OBJS-$(CONFIG_PULSE_INDEV) += pulse_audio_dec.o \ - pulse_audio_common.o + pulse_audio_common.o timefilter.o OBJS-$(CONFIG_PULSE_OUTDEV) += pulse_audio_enc.o \ pulse_audio_common.o OBJS-$(CONFIG_QTKIT_INDEV) += qtkit.o

1 0

LICENSE.md: Add tests/reference.pnm
by git＠videolan.org 30 Nov '14

30 Nov '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Nov 30 19:09:45 2014 +0100| [21c0c0f9d4a1dcc3279e4309ab89137473abf900] | committer: Michael Niedermayer LICENSE.md: Add tests/reference.pnm Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21c0c0f9d4a1dcc32… --- LICENSE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/LICENSE.md b/LICENSE.md index e0a431b..cf9955f 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -64,6 +64,7 @@ There are a handful of files under other licensing terms, namely: documentation accompanying your program if you only distribute executables. You must also indicate any changes including additions and deletions to those three files in the documentation. + tests/reference.pnm is under the expat license external libraries

1 0