summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* lavf/matroskaenc: Force the minimum value for -reserve_index_space to 2.Carl Eugen Hoyos2018-02-121-0/+2
| | | | | Fixes an assertion failure: Assertion size >= 2 failed at libavformat/matroskaenc.c:298
* fate: add aac id3v2 demux testRichard Shaffer2018-02-122-1/+242
| | | | A basic test for demuxing raw AAC (ADTS) with ID3v2 tags.
* libavformat/aac: Parse ID3 tags between ADTS frames.Richard Shaffer2018-02-121-2/+43
| | | | | While rare, ID3 tags may be inserted between ADTS frames. This change enables parsing them and setting the appropriate metadata updated event flag.
* avformat/Makefile: use individual dependencies for librtmp protocolsJames Almer2018-02-121-1/+5
| | | | | | | Fixes compilation of libavformat when librtmp is enabled but all the relevant protocols are disabled. Signed-off-by: James Almer <jamrial@gmail.com>
* h264_idct: enable unmacro on newer NASM versionsRostislav Pehlivanov2018-02-121-1/+5
| | | | Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* Merge commit 'fd36cf6bf6524247a8ff6788c028836fe7d9fd20'James Almer2018-02-111-6/+6
|\ | | | | | | | | | | | | * commit 'fd36cf6bf6524247a8ff6788c028836fe7d9fd20': configure: Factorize check_64_bit() Merged-by: James Almer <jamrial@gmail.com>
| * configure: Factorize check_64_bit()Diego Biurrun2018-02-061-6/+6
| |
* | Merge commit '38434a9ff5b9a1a048f32c1c7e2a9519cf12f8ba'James Almer2018-02-111-6/+5
|\ \ | |/ | | | | | | | | | | * commit '38434a9ff5b9a1a048f32c1c7e2a9519cf12f8ba': configure: Simplify restrict keyword handling Merged-by: James Almer <jamrial@gmail.com>
| * configure: Simplify restrict keyword handlingDiego Biurrun2018-02-061-6/+7
| | | | | | | | Skip a variable indirection and only redefine restrict if necessary.
* | Merge commit '4cf84e254ae75b524e1cacae499a97d7cc9e5906'James Almer2018-02-117-7/+4
|\ \ | |/ | | | | | | | | | | * commit '4cf84e254ae75b524e1cacae499a97d7cc9e5906': Drop some unnecessary config.h #includes Merged-by: James Almer <jamrial@gmail.com>
| * Drop some unnecessary config.h #includesDiego Biurrun2018-02-067-7/+4
| |
* | Merge commit 'bca41545b371efc34e38d1fa8bb12dba8b614da0'James Almer2018-02-111-11/+12
|\ \ | |/ | | | | | | | | | | * commit 'bca41545b371efc34e38d1fa8bb12dba8b614da0': configure: Group code that sets the license string with licensing checks Merged-by: James Almer <jamrial@gmail.com>
| * configure: Group code that sets the license string with licensing checksDiego Biurrun2018-02-061-11/+12
| | | | | | | | | | This also moves the setting of the licensing string out of a block that is skipped when quiet operation is requested.
* | Merge commit '2eb396b175e55e515aa6a13c5b1789a2a18d3935'James Almer2018-02-111-1/+3
|\ \ | |/ | | | | | | | | | | * commit '2eb396b175e55e515aa6a13c5b1789a2a18d3935': hwcontext: Fix memory leak on derived frame allocation failure Merged-by: James Almer <jamrial@gmail.com>
| * hwcontext: Fix memory leak on derived frame allocation failureMark Thompson2018-02-041-1/+3
| |
* | Merge commit '96e476cc9d414e248692c773d9dce736662572b8'James Almer2018-02-110-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '96e476cc9d414e248692c773d9dce736662572b8': hwcontext: Fix documentation for av_hwdevice_ctx_alloc() This commit is a noop, see 9365dfcbf665b83b2e60c5ec5e2abf1f0a49e2c3 Merged-by: James Almer <jamrial@gmail.com>
| * hwcontext: Fix documentation for av_hwdevice_ctx_alloc()Jun Zhao2018-02-041-1/+2
| | | | | | | | | | | | | | From ffmpeg commit 9365dfcbf665b83b2e60c5ec5e2abf1f0a49e2c3. Signed-off-by: Jun Zhao <jun.zhao@intel.com> Signed-off-by: Mark Thompson <sw@jkqxz.net>
* | Merge commit '8965e2af921ec5926b26d5ae466ee4104bb5262b'James Almer2018-02-110-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '8965e2af921ec5926b26d5ae466ee4104bb5262b': avpacket: Initialize the allocated padding area in side data This commit is a noop, see 9cbb3fce5965f4e1423cace3d1dc340a7a8091f4 Merged-by: James Almer <jamrial@gmail.com>
| * avpacket: Initialize the allocated padding area in side dataMartin Storsjö2018-02-011-0/+1
| | | | | | | | | | | | | | | | This makes sure that consumers of the side data actually can rely on the padding as intended, without having the callers of av_packet_new_side_data to explicitly zero initialize it. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5085f25ace1e74846a0de3369bedd0e22d1a1bdc'James Almer2018-02-110-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '5085f25ace1e74846a0de3369bedd0e22d1a1bdc': vc1: skip motion compensation when data for last picture is invalid This commit is a noop. The crash can't be reproduced with ffmpeg. Merged-by: James Almer <jamrial@gmail.com>
| * vc1: skip motion compensation when data for last picture is invalidSean McGovern2018-01-301-0/+5
| | | | | | | | | | Bug-Id: 1101 Cc: libav-stable@libav.org
* | Merge commit '6829a079444e10818a847e153121fb458cc5c0a8'James Almer2018-02-112-4/+1
|\ \ | |/ | | | | | | | | | | * commit '6829a079444e10818a847e153121fb458cc5c0a8': qsvdec: Relax the surface vs coded dimension check Merged-by: James Almer <jamrial@gmail.com>
| * qsvdec: Relax the surface vs coded dimension checkZhong Li2018-01-262-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a common vp8 decoding failure. Many vp8 clips cannot decode if hw_frames_ctx is enabled, reporting "Error during QSV decoding.: incompatible video parameters (-14)". It is due to mfx.FrameInfo.Width/Height not matching coded_w/coded_h. See: avconv -hwaccel qsv -init_hw_device qsv -c:v vp8_qsv -i vp8-test-vectors-r1/vp80-00-comprehensive-001.ivf -vf "hwdownload,format=nv12" -pix_fmt yuv420p -f md5 - Signed-off-by: Zhong Li <zhong.li@intel.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | fate/libavcodec: add codec_desc testMuhammad Faiz2018-02-124-24/+51
| | | | | | | | | | | | | | | | Remove runtime check at codec_desc.c Reviewed-by: wm4 <nfxjfg@googlemail.com> Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* | lavf/rtpdec: Constify several pointers.Carl Eugen Hoyos2018-02-116-13/+13
| | | | | | | | | | | | Fixes two warnings: libavformat/rtpdec.c:155:20: warning: return discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] libavformat/rtpdec.c:168:20: warning: return discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
* | avcodec/vp3: Error out on invalid num_coeffs in unpack_vlcs()Michael Niedermayer2018-02-111-1/+3
| | | | | | | | | | | | This fixes a hypothetical integer overflow Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mpeg4videodec: Ignore multiple VOL headersMichael Niedermayer2018-02-111-2/+2
| | | | | | | | | | | | Fixes: Ticket7005 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mpeg2dec: Fix motion vector rounding for chroma componentsNekopanda2018-02-1111-319/+321
| | | | | | | | | | | | | | | | In 16x8 motion compensation, for lower 16x8 region, the input to mpeg_motion() for motion_y was "motion_y + 16", which causes wrong rounding. For 4:2:0, chroma scaling for y is dividing by two and rounding toward zero. When motion_y < 0 and motion_y + 16 > 0, the rounding direction of "motion_y" and "motion_y + 16" is different and rounding "motion_y + 16" would be incorrect. We should input "motion_y" as is to round correctly. I add "is_16x8" flag to do that. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/vp3: Check eob_runMichael Niedermayer2018-02-111-0/+3
| | | | | | | | | | | | | | | | | | Fixes: out of array access Fixes: 5919/clusterfuzz-testcase-minimized-5859311382167552 Fixes: special case for theora (untested due to lack of sample) Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/utvideodec: Add several out of array read related checksMichael Niedermayer2018-02-111-4/+10
| | | | | | | | | | | | | | Fixes: OV_decode_plane.avi Found-by: GwanYeong Kim <gy741.kim@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/pafvideo: Check allocated frame sizeMichael Niedermayer2018-02-111-0/+4
| | | | | | | | | | | | | | | | Fixes: OOM Fixes: 5549/clusterfuzz-testcase-minimized-5390553567985664 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/scpr: Fix reading a pixel before the firstMichael Niedermayer2018-02-111-0/+4
| | | | | | | | | | | | | | Fixes: 5540/clusterfuzz-testcase-minimized-6122458273808384 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mpeg2dec: Fix field selection for skipped macroblocksNekopanda2018-02-112-164/+166
| | | | | | | | | | | | | | | | | | | | For B field pictures, the spec says, > The prediction shall be made from the field of the same parity as the field being predicted. I did it. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/aptxdec: fix the limit on the APTX demuxer definitionJan Ekström2018-02-101-1/+1
| | | | | | | | | | Fixes breakage with --disable-muxers as it was originally limited to the muxer, and not the demuxer.
* | MAINTAINERS: add myself for aptx.cAurelien Jacobs2018-02-101-0/+1
| |
* | avformat/mov: Fix ctts_index calculationXiaohan Wang2018-02-101-1/+1
| | | | | | | | | | | | | | | | An index should never be equal to the count. Hence we must make sure *ctts_index < ctts_count. Reviewed-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/format: temporarily use old next apiMuhammad Faiz2018-02-101-1/+12
| | | | | | | | | | | | Should fix https://ffmpeg.org/pipermail/ffmpeg-devel/2018-February/225066.html Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* | examples: Don't call deprecated functions which don't do anythingMark Thompson2018-02-0920-40/+0
| |
* | aptx: indentation (cosmetics only)Aurelien Jacobs2018-02-091-52/+52
| |
* | aptx: add raw muxer and demuxer for aptX HDAurelien Jacobs2018-02-096-5/+73
| |
* | aptx: implement the aptX HD bluetooth codecAurelien Jacobs2018-02-098-28/+342
| |
* | aptx: do some clipping to match original codec in extreme casesAurelien Jacobs2018-02-091-1/+2
| |
* | aptx: factorize FFABS calculationAurelien Jacobs2018-02-091-3/+5
| |
* | aptx: simplify by pre-calculating factor_maxAurelien Jacobs2018-02-091-9/+7
| |
* | checkasm/Makefile: add EXTRALIBS-swresampleMuhammad Faiz2018-02-091-1/+1
| | | | | | | | | | | | Should fix https://ffmpeg.org/pipermail/ffmpeg-devel/2018-February/225058.html Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* | avcodec/codec_desc: sort codec_descriptorsMuhammad Faiz2018-02-091-527/+550
| | | | | | | | | | | | | | Use bsearch on avcodec_descriptor_get(). Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* | dashdec: Support SegmentTimeline inside Periodsfan52018-02-091-3/+14
| | | | | | | | Reviewed-by: Steven Liu <lq@onvideo.cn>
* | avcodec/huffyuvdec: Check input buffer sizeMichael Niedermayer2018-02-091-0/+3
| | | | | | | | | | | | | | | | | | Fixes: Timeout Fixes: 5487/clusterfuzz-testcase-4696837035393024 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Revert "cmdutils: make use of new iteration APIs"James Almer2018-02-081-43/+79
| | | | | | | | | | | | | | | | | | | | This reverts commit cdc78058c78dfa4966758a342acd2c1f3b282c46. It introduced several issues in the command line tools, and it's implementing a new API that may still see some changes. Revert for the time being until the state of the API is defined. Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec: Document that init_static_data() is not intended for time consuming ↵Michael Niedermayer2018-02-081-0/+3
| | | | | | | | | | | | | | operations. Reviewed-by: Muhammad Faiz <mfcc64@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
OpenPOWER on IntegriCloud