[FFmpeg-cvslog] MAINTAINERS: add myself to qsv section
ffmpeg | branch: master | Zhong Li | Mon Jun 4 17:41:57 2018 +0800| [550372d0c436b6edad1e0265488d0c38a414855c] | committer: Mark Thompson MAINTAINERS: add myself to qsv section Signed-off-by: Zhong Li > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=550372d0c436b6edad1e0265488d0c38a414855c --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 2172901fe7..78f450dda6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -219,7 +219,7 @@ Codecs: ptx.c Ivo van Poorten qcelp*Reynaldo H. Verdejo Pinochet qdm2.c, qdm2data.hRoberto Togni - qsv* Mark Thompson + qsv* Mark Thompson, Zhong Li qtrle.c Mike Melanson ra144.c, ra144.h, ra288.c, ra288.hRoberto Togni resample2.c Michael Niedermayer ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/shorten: Sanity check nmeans
ffmpeg | branch: master | Michael Niedermayer | Tue
Jun 5 13:03:48 2018 +0200| [d91a0b503d7a886587281bc1ee42476aa5e89f85] |
committer: Michael Niedermayer
avcodec/shorten: Sanity check nmeans
Fixes: OOM
Fixes:
8195/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5179785826271232
The reference software appears to use longs for 32bits and it uses int for
nmeans
hinting that the intended maximum size was not 32bit.
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d91a0b503d7a886587281bc1ee42476aa5e89f85
---
libavcodec/shorten.c | 4
1 file changed, 4 insertions(+)
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index ae0cdfe09d..8aeacfeb31 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -450,6 +450,10 @@ static int read_header(ShortenContext *s)
return AVERROR_INVALIDDATA;
}
s->nmean = get_uint(s, 0);
+if (s->nmean > 32768U) {
+av_log(s->avctx, AV_LOG_ERROR, "nmean is: %d\n", s->nmean);
+return AVERROR_INVALIDDATA;
+}
skip_bytes = get_uint(s, NSKIPSIZE);
if ((unsigned)skip_bytes > get_bits_left(>gb)/8) {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/shorten: Fix a negative left shift in shorten_decode_frame()
ffmpeg | branch: master | Michael Niedermayer | Tue Jun 5 13:12:54 2018 +0200| [a711efe922b2bf1d363bdf7f8357656c3e35021e] | committer: Michael Niedermayer avcodec/shorten: Fix a negative left shift in shorten_decode_frame() Fixes: left shift of negative value -9057 Fixes: 8527/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5666853924896768 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a711efe922b2bf1d363bdf7f8357656c3e35021e --- libavcodec/shorten.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 8aeacfeb31..f7475b4954 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -710,7 +710,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, if (s->version < 2) s->offset[channel][s->nmean - 1] = sum / s->blocksize; else -s->offset[channel][s->nmean - 1] = s->bitshift == 32 ? 0 : (sum / s->blocksize) << s->bitshift; +s->offset[channel][s->nmean - 1] = s->bitshift == 32 ? 0 : (sum / s->blocksize) * (1 << s->bitshift); } /* copy wrap samples for use with next block */ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/shorten: Fix undefined shift in fix_bitshift()
ffmpeg | branch: master | Michael Niedermayer | Tue
Jun 5 13:15:34 2018 +0200| [606c7148231404544005c0827b83c165dd6b39a8] |
committer: Michael Niedermayer
avcodec/shorten: Fix undefined shift in fix_bitshift()
Fixes: left shift of negative value -9
Fixes:
8571/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5715966875926528
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=606c7148231404544005c0827b83c165dd6b39a8
---
libavcodec/shorten.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index f7475b4954..0bd3e1e5f7 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -177,7 +177,7 @@ static void fix_bitshift(ShortenContext *s, int32_t *buffer)
buffer[i] = 0;
} else if (s->bitshift != 0) {
for (i = 0; i < s->blocksize; i++)
-buffer[i] <<= s->bitshift;
+buffer[i] *= 1 << s->bitshift;
}
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/shorten: Fix multiple integer overflows
ffmpeg | branch: master | Michael Niedermayer | Tue
Jun 5 13:19:35 2018 +0200| [f2abd36b3863188894fd21964c662b6c17268bfb] |
committer: Michael Niedermayer
avcodec/shorten: Fix multiple integer overflows
Fixes: signed integer overflow: 3 * 1006632960 cannot be represented in type
'int'
Fixes:
8278/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5692857166856192
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f2abd36b3863188894fd21964c662b6c17268bfb
---
libavcodec/shorten.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index 0bd3e1e5f7..18a12d0b97 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -389,7 +389,7 @@ static int decode_subframe_lpc(ShortenContext *s, int
command, int channel,
for (i = 0; i < s->blocksize; i++) {
sum = init_sum;
for (j = 0; j < pred_order; j++)
-sum += coeffs[j] * s->decoded[channel][i - j - 1];
+sum += coeffs[j] * (unsigned)s->decoded[channel][i - j - 1];
s->decoded[channel][i] = get_sr_golomb_shorten(>gb, residual_size) +
(sum >> qshift);
}
@@ -700,7 +700,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void
*data,
/* update means with info from the current block */
if (s->nmean > 0) {
-int32_t sum = (s->version < 2) ? 0 : s->blocksize / 2;
+int64_t sum = (s->version < 2) ? 0 : s->blocksize / 2;
for (i = 0; i < s->blocksize; i++)
sum += s->decoded[channel][i];
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: fix check for opencl
ffmpeg | branch: master | Jun Zhao | Sat Jun 2 11:02:38
2018 +0800| [3769aafb7c9a1fdcd1c9099a8ed7ba1d876c0693] | committer: Jun Zhao
configure: fix check for opencl
add pkg-config support for opencl check.
Signed-off-by: Jun Zhao
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3769aafb7c9a1fdcd1c9099a8ed7ba1d876c0693
---
configure | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 625cfef2ff..473be31d7f 100755
--- a/configure
+++ b/configure
@@ -6135,7 +6135,8 @@ enabled openal&& { { for al_extralibs in
"${OPENAL_LIBS}" "-lopenal"
die "ERROR: openal not found"; } &&
{ test_cpp_condition "AL/al.h"
"defined(AL_VERSION_1_1)" ||
die "ERROR: openal must be installed and
version must be 1.1 or compatible"; }
-enabled opencl&& { check_lib opencl OpenCL/cl.h
clEnqueueNDRangeKernel -Wl,-framework,OpenCL ||
+enabled opencl&& { check_pkg_config opencl OpenCL CL/cl.h
clEnqueueNDRangeKernel ||
+ check_lib opencl OpenCL/cl.h
clEnqueueNDRangeKernel -Wl,-framework,OpenCL ||
check_lib opencl CL/cl.h clEnqueueNDRangeKernel
-lOpenCL ||
die "ERROR: opencl not found"; } &&
{ test_cpp_condition "OpenCL/cl.h"
"defined(CL_VERSION_1_2)" ||
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavfi/opencl: remove redundant header.
ffmpeg | branch: master | Jun Zhao | Wed May 30 08:54:45 2018 +0800| [3161df5b0c2dfa31b9c19ba13b4c943773cf57a5] | committer: Jun Zhao lavfi/opencl: remove redundant header. remove redundant header Signed-off-by: Jun Zhao > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3161df5b0c2dfa31b9c19ba13b4c943773cf57a5 --- libavfilter/opencl.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavfilter/opencl.c b/libavfilter/opencl.c index ae61667380..ac5eec68c6 100644 --- a/libavfilter/opencl.c +++ b/libavfilter/opencl.c @@ -19,12 +19,9 @@ #include #include -#include "libavutil/hwcontext.h" -#include "libavutil/hwcontext_opencl.h" #include "libavutil/mem.h" #include "libavutil/pixdesc.h" -#include "avfilter.h" #include "formats.h" #include "opencl.h" ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavu/hwcontext_opecl: fix the build warning
ffmpeg | branch: master | Jun Zhao | Wed May 30 08:13:13
2018 +0800| [3bab7b70da9705031bfc23d9fd15dc49af967055] | committer: Jun Zhao
lavu/hwcontext_opecl: fix the build warning
fix the build warning when use Portable Computing Language (pocl).
Signed-off-by: Jun Zhao
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3bab7b70da9705031bfc23d9fd15dc49af967055
---
libavutil/hwcontext_opencl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c
index e08d7bcb9b..07458c2fb1 100644
--- a/libavutil/hwcontext_opencl.c
+++ b/libavutil/hwcontext_opencl.c
@@ -2810,7 +2810,7 @@ static int opencl_map_from(AVHWFramesContext *hwfc,
AVFrame *dst,
static int opencl_map_to(AVHWFramesContext *hwfc, AVFrame *dst,
const AVFrame *src, int flags)
{
-OpenCLDeviceContext *priv = hwfc->device_ctx->internal->priv;
+av_unused OpenCLDeviceContext *priv = hwfc->device_ctx->internal->priv;
av_assert0(dst->format == AV_PIX_FMT_OPENCL);
switch (src->format) {
#if HAVE_OPENCL_DRM_BEIGNET
@@ -2851,7 +2851,7 @@ static int opencl_map_to(AVHWFramesContext *hwfc, AVFrame
*dst,
static int opencl_frames_derive_to(AVHWFramesContext *dst_fc,
AVHWFramesContext *src_fc, int flags)
{
-OpenCLDeviceContext *priv = dst_fc->device_ctx->internal->priv;
+av_unused OpenCLDeviceContext *priv = dst_fc->device_ctx->internal->priv;
switch (src_fc->device_ctx->type) {
#if HAVE_OPENCL_DRM_BEIGNET
case AV_HWDEVICE_TYPE_DRM:
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc/general.texi: clarify FDK-AAC licensing & usability
ffmpeg | branch: master | Gyan Doshi | Thu Jun 7 17:22:56
2018 +0530| [47a818323ba0fea16667031e0788756960a308ea] | committer: Gyan Doshi
doc/general.texi: clarify FDK-AAC licensing & usability
Mnetion it can be used to decode as well.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47a818323ba0fea16667031e0788756960a308ea
---
doc/general.texi | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/doc/general.texi b/doc/general.texi
index 2583006b14..8c3a04b078 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -46,9 +46,10 @@ upgrade FFmpeg's license to LGPL version 3 (or if you have
enabled
GPL components, GPL version 3) by passing @code{--enable-version3} to
configure in
order to use it.
-The Fraunhofer AAC library is licensed under a license incompatible to the GPL
-and is not known to be compatible to the LGPL. Therefore, you have to pass
-@code{--enable-nonfree} to configure to use it.
+The license of the Fraunhofer AAC library is incompatible with the GPL.
+Therefore, for GPL builds, you have to pass @code{--enable-nonfree} to
+configure in order to use it. To the best of our knowledge, it is
+compatible with the LGPL.
@end float
@subsection OpenCORE AMR
@@ -71,7 +72,7 @@ Then pass @code{--enable-libvo-amrwbenc} to configure to
enable it.
@subsection Fraunhofer AAC library
-FFmpeg can make use of the Fraunhofer AAC library for AAC encoding.
+FFmpeg can make use of the Fraunhofer AAC library for AAC decoding & encoding.
Go to @url{http://sourceforge.net/projects/opencore-amr/} and follow the
instructions for installing the library.
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
