]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Thu, 20 Feb 2014 13:39:33 +0000 (14:39 +0100)]
Merge commit '
192ccc5034ad4ac1b5022fc16c1162267add6a0f '
* commit '
192ccc5034ad4ac1b5022fc16c1162267add6a0f ':
build: The MPEG-4 video parser depends on h263dsp
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 19 Feb 2014 19:33:28 +0000 (20:33 +0100)]
build: The MPEG-4 video parser depends on h263dsp
The dependency is indirect through the h263/mpegvideo code.
CC: libav-stable@libav.org
Michael Niedermayer [Thu, 20 Feb 2014 04:48:54 +0000 (05:48 +0100)]
avcodec/mpeg4videodec: Check for bitstream overread in decode_vol_header()
Fixes out of array read
Fixes: 08e48e9daae7d8f8ab6dbe3919e797e5-asan_heap-oob_157461c_5295_cov_1266798650_firefing.mpg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Wed, 19 Feb 2014 16:43:46 +0000 (17:43 +0100)]
lavf/mux: check av_dup_packet() return value.
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Feb 2014 01:53:36 +0000 (02:53 +0100)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavfi/pan: use extended_data instead of data.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Jan 2014 22:23:28 +0000 (23:23 +0100)]
avfilter/vf_fps: fix rounding error accumulation
Fixes Ticket3329
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Feb 2014 01:10:05 +0000 (02:10 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libavformat/mpegts: expose raw packet size
Conflicts:
libavformat/mpegts.c
See:
f9b997c337873dad99f7fd505588b260febaf32b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Feb 2014 01:01:13 +0000 (02:01 +0100)]
Merge commit '
c3ecd968f0e78da6e77f0c06c2f785b266d83cf1 '
* commit '
c3ecd968f0e78da6e77f0c06c2f785b266d83cf1 ':
AVOptions: add flags for read/read-only options
Conflicts:
libavutil/opt.c
libavutil/opt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 20 Feb 2014 00:50:26 +0000 (01:50 +0100)]
Merge commit '
6bb8720f00e2e6209665f819fb351fd42b82d5d0 '
* commit '
6bb8720f00e2e6209665f819fb351fd42b82d5d0 ':
AVOptions: deprecate unused AV_OPT_FLAG_METADATA
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Feb 2014 21:31:10 +0000 (22:31 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hevc: Always consider VLC NALU type mismatch fatal
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Feb 2014 21:10:00 +0000 (22:10 +0100)]
Merge commit '
175e5063320f585118a5461f15dbacf2ce17e97d '
* commit '
175e5063320f585118a5461f15dbacf2ce17e97d ':
hevc: Mention the missing SPS in the error message
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Feb 2014 21:09:10 +0000 (22:09 +0100)]
Merge commit '
93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd '
* commit '
93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd ':
doc: Name the MOV muxer as it should be called
Conflicts:
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Feb 2014 21:06:12 +0000 (22:06 +0100)]
Merge commit '
a7b3216cbdc7796a9d14cd22a863fae3556098ba '
* commit '
a7b3216cbdc7796a9d14cd22a863fae3556098ba ':
doc: Sort the muxer documentation
Conflicts:
doc/muxers.texi
No change as ours was already sorted
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Feb 2014 20:53:42 +0000 (21:53 +0100)]
Merge commit '
874c751cc5b99cd68932e21c2c3a0d21134207e0 '
* commit '
874c751cc5b99cd68932e21c2c3a0d21134207e0 ':
threads: Check w32threads dependencies at the configure stage
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Leandro Dorileo [Fri, 31 Jan 2014 16:48:11 +0000 (14:48 -0200)]
libavformat/mpegts: expose raw packet size
We cannot easily determine if an mpeg TS's packet size is DVHS, FEC
or so on, for that we need to expose the internal raw_packet_size
field.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sat, 15 Feb 2014 07:24:23 +0000 (08:24 +0100)]
AVOptions: add flags for read/read-only options
Anton Khirnov [Sat, 15 Feb 2014 07:14:03 +0000 (08:14 +0100)]
AVOptions: deprecate unused AV_OPT_FLAG_METADATA
It was never used since it was added and the things it was intended for
are now exported differently.
Michael Niedermayer [Wed, 19 Feb 2014 19:19:38 +0000 (20:19 +0100)]
avcodec/huffyuv: simplify allocation of temporaries
This also fixes a null pointer dereference with rgb and plane prediction
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 19 Feb 2014 18:55:14 +0000 (19:55 +0100)]
Add decklink_enc.h to SKIPHEADERS.
Fixes make checkheaders without decklink headers.
Michael Niedermayer [Wed, 19 Feb 2014 17:36:00 +0000 (18:36 +0100)]
ffmpeg: reduce frame rate for mpeg4 to be within the spec limits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Feb 2014 17:20:13 +0000 (18:20 +0100)]
avformat/utils: av_guess_frame_rate() favor avg_frame_rate if r_frame_rate has a comparably unlikely value
Fixes Ticket3399
Fixes Ticket2958
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 19 Feb 2014 16:27:36 +0000 (17:27 +0100)]
Fix dctdnoiz dependencies, the filter should select dct, not fft.
Fixes compilation with --disable-everything --enable-filter=dctdnoiz
Luca Barbato [Tue, 18 Feb 2014 22:58:59 +0000 (23:58 +0100)]
hevc: Always consider VLC NALU type mismatch fatal
Sample-Id:
00001667 -google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Tue, 18 Feb 2014 22:55:29 +0000 (23:55 +0100)]
hevc: Mention the missing SPS in the error message
Luca Barbato [Tue, 18 Feb 2014 20:57:12 +0000 (21:57 +0100)]
doc: Name the MOV muxer as it should be called
The section name is the muxer, not the format.
Luca Barbato [Tue, 18 Feb 2014 16:12:30 +0000 (17:12 +0100)]
doc: Sort the muxer documentation
Keep the sections alphabetically sorted.
Michael Niedermayer [Wed, 19 Feb 2014 15:16:41 +0000 (16:16 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_interlace: deprecate lowpass option
Conflicts:
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Feb 2014 14:44:36 +0000 (15:44 +0100)]
Merge commit '
b23bc95920e2f10b9621857e829c45b064f356c0 '
* commit '
b23bc95920e2f10b9621857e829c45b064f356c0 ':
x86: dca: Add missing multiple inclusion guards
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 18 Dec 2013 21:29:25 +0000 (22:29 +0100)]
threads: Check w32threads dependencies at the configure stage
Also add warning comment about threading implementations without matching
atomics implementation to the atomics fallback implementation.
Michael Niedermayer [Wed, 19 Feb 2014 13:31:26 +0000 (14:31 +0100)]
Merge commit '
294a51e18ab7df4d658249361a03f0d716a4e9f0 '
* commit '
294a51e18ab7df4d658249361a03f0d716a4e9f0 ':
gitignore: Add all examples below doc/examples
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Feb 2014 13:20:22 +0000 (14:20 +0100)]
avformat/movenc: simplify code, decrease difference to libav
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Feb 2014 13:19:45 +0000 (14:19 +0100)]
Merge commit '
1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66 '
* commit '
1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66 ':
movenc: Add a fallback fragmentation method for plain mp4 as well
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Feb 2014 13:01:25 +0000 (14:01 +0100)]
Merge commit '
543156d7518f5e5d731123da066d86278f9fa492 '
* commit '
543156d7518f5e5d731123da066d86278f9fa492 ':
arm: Mark the stack as non-executable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Feb 2014 04:54:54 +0000 (05:54 +0100)]
avcodec/mpeg4videodec: set field durations to safe values when they are invalid
Fixes division by 0
Fixes: 3c980274cecaca6ca5d6e517c0c1983e-signal_sigabrt_7ffff7125425_410_cov_3621042467_2_audio_streams.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Fri, 14 Feb 2014 04:57:47 +0000 (05:57 +0100)]
vf_interlace: deprecate lowpass option
Nicolas George [Tue, 11 Feb 2014 14:15:58 +0000 (15:15 +0100)]
lavfi/pan: use extended_data instead of data.
Fix trac ticket #3380.
Diego Biurrun [Tue, 18 Feb 2014 13:30:04 +0000 (14:30 +0100)]
x86: dca: Add missing multiple inclusion guards
Diego Biurrun [Tue, 18 Feb 2014 17:37:48 +0000 (18:37 +0100)]
gitignore: Add all examples below doc/examples
Martin Storsjö [Tue, 18 Feb 2014 14:11:59 +0000 (16:11 +0200)]
movenc: Add a fallback fragmentation method for plain mp4 as well
Previously the default fragmentation method was only enabled
if writing an ISM file.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 7 Feb 2014 14:22:54 +0000 (16:22 +0200)]
arm: Mark the stack as non-executable
If linking in an object file without this attribute set, the
linker will assume that an executable stack might be needed.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Mon, 17 Feb 2014 22:54:37 +0000 (17:54 -0500)]
tiny_ssim: add per-frame metrics and final ssim db number.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Feb 2014 01:24:52 +0000 (02:24 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: informative error reporting in decode_slice_header()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 19 Feb 2014 01:24:09 +0000 (02:24 +0100)]
Merge commit '
96f9fbe10933944b3eba86efa1d1ca094f2c28f8 '
* commit '
96f9fbe10933944b3eba86efa1d1ca094f2c28f8 ':
h264: fix slice_type value reported in decode_slice_header()
See:
ec51b3308effbd0f434db87efabe600cd1f8cb36
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Tue, 18 Feb 2014 22:47:55 +0000 (23:47 +0100)]
h264: informative error reporting in decode_slice_header()
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Luca Barbato [Tue, 18 Feb 2014 22:47:32 +0000 (23:47 +0100)]
h264: fix slice_type value reported in decode_slice_header()
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Michael Niedermayer [Tue, 18 Feb 2014 20:43:57 +0000 (21:43 +0100)]
avutil/opt: preserve fractions in set_string_number()
This avoids going over a double precission float, which may loose precission
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 18:02:01 +0000 (19:02 +0100)]
ffmpeg: support setting the chroma intra matrix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Feb 2014 18:01:41 +0000 (19:01 +0100)]
avcodec: support setting the chroma intra matrix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gonzalo Garramuno [Mon, 17 Feb 2014 17:53:30 +0000 (14:53 -0300)]
avcodec/exr: read layers
EXR files have, like tiffs, multiple channels and layers. I have a
patch for exr.c that allows you to select the layer you want to process
thru a -layer flag. It is not bulletproof but works for all layers that
have 3 channels in them (normals, motion vectors, etc).
The calling convention for ffmpeg is:
ffmpeg -layer Diffuse -i myexr.%d.exr test.mov
Here's an exr image with multiple layers:
http://www.datafilehost.com/d/
e45d9a1c
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Mon, 17 Feb 2014 20:57:42 +0000 (21:57 +0100)]
vp9/x86: set correct number of registers used in intra pred asm
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Feb 2014 15:07:54 +0000 (16:07 +0100)]
avcodec/huffyuvdec: use RGB0 for 24bit rgb output instead of BGRA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Feb 2014 14:06:46 +0000 (15:06 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix libswresample compilation with Apple Neon assembler.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Feb 2014 12:51:25 +0000 (13:51 +0100)]
avcodec/huffyuvdec: use the correct height field
Fixes Ticket3395
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Feb 2014 01:53:14 +0000 (02:53 +0100)]
avcodec/snow: split block clipping checks
Fixes out of array read
Fixes: d4476f68ca1c1c57afbc45806f581963-asan_heap-oob_2266b27_8607_cov_4044577381_snow_chroma_bug.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Feb 2014 22:44:49 +0000 (23:44 +0100)]
avformat/bink: Check return value of av_add_index_entry()
Fixes null pointer dereference
Fixes: cdbf15cbd0a27cee958dd0b8800e452e-signal_sigsegv_737991_2083_cov_317652874_LBSTART.BIK
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Feb 2014 20:20:38 +0000 (21:20 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doxygen: Replace @parblock syntax with manual linebreaks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Feb 2014 20:11:29 +0000 (21:11 +0100)]
Merge commit '
4d7ab5cfebef91820af2933ef2f622ea598e6b53 '
* commit '
4d7ab5cfebef91820af2933ef2f622ea598e6b53 ':
doxygen: Add a number of missing function parameter descriptions
Conflicts:
libavformat/avformat.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Feb 2014 19:59:51 +0000 (20:59 +0100)]
Merge commit '
614b9e4db8f3d7c23fc0410fc04745a727a82f4e '
* commit '
614b9e4db8f3d7c23fc0410fc04745a727a82f4e ':
h264: use avpriv_request_sample for chroma_format_idc
Conflicts:
libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Feb 2014 19:49:42 +0000 (20:49 +0100)]
avcodec/ansi: fix integer overflow
Fixes out of array read
Fixes: 5f9698e86d92f19bb08d54ff0d57027f-signal_sigsegv_b30756_3795_cov_2693691257_ansi256.ans
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sun, 16 Feb 2014 04:34:23 +0000 (15:34 +1100)]
avcodec/vp8dsp: evaluate CONFIG_VP7_DECODER/CONFIG_VP8_DECODER
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Mon, 17 Feb 2014 16:40:10 +0000 (17:40 +0100)]
Fix libswresample compilation with Apple Neon assembler.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Diego Biurrun [Sun, 16 Feb 2014 21:09:30 +0000 (22:09 +0100)]
doxygen: Replace @parblock syntax with manual linebreaks
@parblock is only supported in very recent Doxygen versions.
Diego Biurrun [Sun, 16 Feb 2014 22:36:31 +0000 (23:36 +0100)]
doxygen: Add a number of missing function parameter descriptions
James Almer [Wed, 12 Feb 2014 01:28:54 +0000 (22:28 -0300)]
tta/x86: add ff_ttafilter_process_dec_{ssse3, sse4}
Results are from a Win64 build running on an AMD FX 6300
1121 decicycles in ttafilter_process_dec_c,
16777112 runs, 104 skips
522 decicycles in ff_ttafilter_process_dec_ssse3,
16777149 runs, 67 skips
477 decicycles in ff_ttafilter_process_dec_sse4,
16777156 runs, 60 skips
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Feb 2014 05:59:59 +0000 (06:59 +0100)]
doc/examples: remove pathes from doxy examples
This makes the examples page less cluttered
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sun, 16 Feb 2014 21:36:51 +0000 (16:36 -0500)]
vp9: split decode_coeff_b loop inside txsz branch.
The advantage of this is that the is32x32 division branch in
decode_coeffs_b is removed from the inner loop to outside the block
coef decoding loop in decode_coeffs. Also, it allows us to merge the
txsz branches from the block coef decoding loop, the context merge
and the context split.
Ronald S. Bultje [Sun, 16 Feb 2014 18:30:50 +0000 (13:30 -0500)]
vp9/x86: intra prediction SIMD.
Partially based on h264_intrapred. (I hope to eventually merge these
two intrapred implementations back together.)
Michael Niedermayer [Mon, 17 Feb 2014 02:18:44 +0000 (03:18 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd: add list devices API
lavd/opengl_enc_shaders: fix gray* shader
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicholas Robbins [Sun, 16 Feb 2014 21:02:33 +0000 (16:02 -0500)]
MAINTAINERS: add myself as vf_dejudder.c maintainer
Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sun, 16 Feb 2014 04:32:59 +0000 (15:32 +1100)]
avcodec/vp8dsp: zeroise input coefficient array after use in vp7 idct functions
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Feb 2014 01:46:57 +0000 (02:46 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: Fix project name typo
Merge for metadata only
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Feb 2014 00:48:42 +0000 (01:48 +0100)]
Merge commit '
b339182eba34f28de5f1a477cdd2c84f1ef35d90 '
* commit '
b339182eba34f28de5f1a477cdd2c84f1ef35d90 ':
Move all example programs to doc/examples
Conflicts:
configure
doc/Makefile
doc/doxy-wrapper.sh
doc/examples/avcodec.c
doc/examples/decoding_encoding.c
doc/examples/metadata.c
doc/examples/muxing.c
doc/examples/transcode_aac.c
libavcodec/Makefile
libavcodec/api-example.c
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Feb 2014 23:24:20 +0000 (00:24 +0100)]
avcodec/h264: more completely check the loop filter parameters
Fixes out of array read
Fixes: caa65cc01655505705129b677189f036-signal_sigsegv_fdcc43_2681_cov_3043376737_PPH422I5_Panasonic_A.264
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Sun, 16 Feb 2014 22:07:21 +0000 (23:07 +0100)]
h264: use avpriv_request_sample for chroma_format_idc
Michael Niedermayer [Sun, 16 Feb 2014 22:08:52 +0000 (23:08 +0100)]
avcodec/msrle: use av_image_get_linesize() to calculate the linesize
Fixes out of array access
Fixes: 14a74a0a2dc67ede543f0e35d834fbbe-asan_heap-oob_49572c_556_cov_215466444_44_001_engine_room.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alexander Strasser [Sun, 16 Feb 2014 19:34:56 +0000 (20:34 +0100)]
doc/APIchanges: Update for new function avio_find_protocol_name
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Alexander Strasser [Sun, 5 Jan 2014 02:06:20 +0000 (03:06 +0100)]
ffmpeg_opt: assert_file_overwrite: Work for all file protocol outputs
Currently the file overwrite check does not work for paths that
contain a colon.
Use avio_find_protocol to always execute the existence check if
the file protocol is going to be used.
Fix remaining part of ticket #3249.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Alexander Strasser [Sun, 5 Jan 2014 01:11:18 +0000 (02:11 +0100)]
lavf/avio: Introduce avio_find_protocol_name
Make it possible to find out what protocol will be chosen
for a given URL.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Diego Biurrun [Sun, 16 Feb 2014 21:08:21 +0000 (22:08 +0100)]
doc: Fix project name typo
Diego Biurrun [Sat, 15 Feb 2014 14:50:29 +0000 (15:50 +0100)]
Move all example programs to doc/examples
Also drop support for building examples in library directories.
Michael Niedermayer [Sun, 16 Feb 2014 20:12:08 +0000 (21:12 +0100)]
avcodec/dxtory: fix src size checks
Fixes integer overflow
Fixes out of array read
Fixes: d104661bb59b202df7671fb19a00ca6c-asan_heap-oob_d6429d_5066_cov_1729501105_dxtory_mic.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Feb 2014 19:37:18 +0000 (20:37 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
g2meet: validate bpp and bitmasks in the display info
Conflicts:
libavcodec/g2meet.c
See:
ae95b2f8103cf0136889884fdf1c4e5136634991
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sun, 16 Feb 2014 19:06:23 +0000 (20:06 +0100)]
lavd: add list devices API
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Lukasz Marek [Sun, 16 Feb 2014 18:56:25 +0000 (19:56 +0100)]
lavd/opengl_enc_shaders: fix gray* shader
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Michael Niedermayer [Sun, 16 Feb 2014 18:05:49 +0000 (19:05 +0100)]
avformat/mov: fix avg_frame_rate calculation
Fixes integer overflow
Fixes Ticket3390
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicholas Robbins [Fri, 14 Feb 2014 21:15:44 +0000 (16:15 -0500)]
lavfi: adding dejudder filter to remove judder produced by partially telecined material.
Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Maxim Poliakovski [Sat, 15 Feb 2014 20:09:22 +0000 (21:09 +0100)]
g2meet: validate bpp and bitmasks in the display info
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Michael Niedermayer [Sun, 16 Feb 2014 12:12:39 +0000 (13:12 +0100)]
avcodec/alsdec: check predictor order against block length
Fixes out of array access
Fixes: abd3c041acbcb816be113455d138166b-asan_heap-oob_b11634_3707_cov_1707137151_als_05_2ch48k16b.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 16 Feb 2014 06:02:47 +0000 (03:02 -0300)]
x86/fladsp: add missing check to ff_flacdsp_init_x86()
Fixes compilation with flac decoder disabled and encoder enabled
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Fri, 7 Feb 2014 00:20:58 +0000 (16:20 -0800)]
doc/ffmpeg: make the ASCII flow charts narrower to fit onto TTY
These charts in man page are currently destroyed.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Sat, 15 Feb 2014 22:25:33 +0000 (23:25 +0100)]
oggdec/vorbis: fix stream duration condition
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Feb 2014 01:24:52 +0000 (02:24 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Prepare for 10_beta1 Release
Conflicts:
RELEASE
merge only for metadata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Feb 2014 01:18:58 +0000 (02:18 +0100)]
Merge commit '
9cd4bc41760f8ad879e248920eacbe1e7757152c '
* commit '
9cd4bc41760f8ad879e248920eacbe1e7757152c ':
ac3dec: set AV_FRAME_DATA_DOWNMIX_INFO side data.
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Feb 2014 01:05:29 +0000 (02:05 +0100)]
Merge commit '
c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c '
* commit '
c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c ':
lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Feb 2014 00:56:15 +0000 (01:56 +0100)]
Merge commit '
9c0e4b3395cad79c560d03d2a94595d89e017885 '
* commit '
9c0e4b3395cad79c560d03d2a94595d89e017885 ':
ac3: update AC3PreferredStereoDownmixMode.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Feb 2014 00:28:26 +0000 (01:28 +0100)]
avcodec/utils: set AVFrame format unconditional
Fixes inconsistency and out of array accesses
Fixes: 10cdd7e63e7f66e3e66273939e0863dd-asan_heap-oob_1a4ff32_7078_cov_4056274555_mov_h264_aac__mp4box_frag.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 15 Feb 2014 22:26:19 +0000 (23:26 +0100)]
avcodec/hevc: make *ps_id unsigned
Fixes integer overflow
Fixes out of array accesses
Fixes
2f65e7dbd02a12f426a423bd7bf880b4 -signal_sigsegv_127c952_2793_cov_2517424539_RPLM_A_qualcomm_4.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 15 Feb 2014 22:09:55 +0000 (23:09 +0100)]
avcodec/hevc: Dont turn 32bit timebases into negative numbers
Fixes assertion failure
Fixes: 499f6ecaeae8e3f79a115a72c61ffd15-asan_static-oob_124a175_2792_cov_1782273879_RPLM_A_qualcomm_4.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reinhard Tartler [Sat, 15 Feb 2014 21:49:04 +0000 (16:49 -0500)]
Prepare for 10_beta1 Release
Michael Niedermayer [Sat, 15 Feb 2014 21:29:17 +0000 (22:29 +0100)]
avcodec/hevc_ps: Use get_bits_long() in decode_vui()
Fix assertion failure
Fixes: a225222ef88a0f5b1e93e1d0432debc3-asan_static-oob_124a17d_1448_cov_77608227_DBLK_E_VIXS_1.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>