]>
git.sesse.net Git - ffmpeg/log
Stefano Sabatini [Tue, 17 Jan 2012 14:25:14 +0000 (15:25 +0100)]
lavu: introduce av_parse_ratio() and use it in ffmpeg and lavfi/aspect
Factorize code and provide ratio parsing consistency.
Stefano Sabatini [Mon, 6 Feb 2012 09:44:54 +0000 (10:44 +0100)]
ffprobe: fix typo in ESCAPE_CHECK_SIZE
Michael Niedermayer [Mon, 6 Feb 2012 00:02:45 +0000 (01:02 +0100)]
cache: fix "warning: passing argument 2 of ‘av_tempfile’ from incompatible pointer type"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Feb 2012 00:02:07 +0000 (01:02 +0100)]
fix "warning: variable ‘cflags’ set but not used"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 5 Feb 2012 22:21:51 +0000 (23:21 +0100)]
avio: Fix "warning: initialization from incompatible pointer type"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 5 Feb 2012 23:31:12 +0000 (00:31 +0100)]
changelog: fix typo
Paul B Mahol [Sun, 5 Feb 2012 23:29:32 +0000 (00:29 +0100)]
v408: do not unconditionally compile codecs
Carl Eugen Hoyos [Sun, 5 Feb 2012 19:43:33 +0000 (20:43 +0100)]
Add v408 / AYUV encoder and decoder.
Fixes last part of ticket #470.
Reviewed-by: Paul B Mahol
Carl Eugen Hoyos [Sun, 5 Feb 2012 19:06:12 +0000 (20:06 +0100)]
Support YV12 from video4linux2 devices.
Reviewed-by: Luca Abeni
Carl Eugen Hoyos [Sun, 5 Feb 2012 16:42:26 +0000 (17:42 +0100)]
Allow muxing VP6A into flv.
Reviewed-by: James Zern
Reimar Döffinger [Sat, 4 Feb 2012 20:04:19 +0000 (21:04 +0100)]
oggdec: add missing ogg_reset on seek.
It would never be called when the searched-for position
was already in the index.
In the other cases, the ogg_reset at the end of the
read_timestamp function handled it.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 4 Feb 2012 19:31:21 +0000 (20:31 +0100)]
oggdec: fix keyframe seeking when granule_is_start is 0.
In this case, the pts values will be delayed by one, but
at the same time pts values might only be supplied for e.g.
keyframes.
This results on only the frame after the keyframe having a
pts value.
As a hack, make read_timestamp return the keyframe position
together with the pts from a following frame when seeking
to a keyframe.
Fixes trac issue #438.
However it causes the read_timestamp function to return a
pos value that is actually before the packet with the
indicated pts.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Sun, 5 Feb 2012 04:14:26 +0000 (05:14 +0100)]
ffmpeg: document avi special case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 5 Feb 2012 02:02:23 +0000 (03:02 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ape: fix seeking
apedec: 8bit and 24bit support
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 5 Feb 2012 01:08:03 +0000 (02:08 +0100)]
dwt: fix about a dozen "warning: assignment from incompatible pointer type"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 5 Feb 2012 01:00:02 +0000 (02:00 +0100)]
dwt: fix a dozen or so "warning: initialization from incompatible pointer type"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 5 Feb 2012 00:34:59 +0000 (01:34 +0100)]
mpegaudiodec: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 3 Feb 2012 18:30:18 +0000 (18:30 +0000)]
ape: fix seeking
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Michael Niedermayer [Sat, 4 Feb 2012 19:27:02 +0000 (20:27 +0100)]
adler32: add comment for the SIMD code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Feb 2012 06:52:31 +0000 (07:52 +0100)]
adler32: rewrite using integer SIMD.
about twice as fast as before.
the not CONFIG_SMALL case is also droped as it is not faster than the
CONFIG_SMALL case.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sat, 4 Feb 2012 19:15:55 +0000 (20:15 +0100)]
Remove warning about Ogg skeleton v4.
We can handle v4 just fine, the parts we currently use
are the same for v3 and v4.
v4 can in addition contain an index which we so far do
not use though.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Paul B Mahol [Fri, 3 Feb 2012 15:37:06 +0000 (15:37 +0000)]
apedec: 8bit and 24bit support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Clément Bœsch [Fri, 3 Feb 2012 19:28:32 +0000 (20:28 +0100)]
fate: use compression level 0 for flashsv2 tests.
Output sizes mismatch (and thus MD5) between zlib version 1.2.5 and
1.2.6 if compression level > 0. The issue doesn't affect the intra-only
tests.
Reimar Döffinger [Sat, 4 Feb 2012 14:27:34 +0000 (15:27 +0100)]
Fix potential infinite discard loop.
Fixes trac issue #438.
Seeking in that sample would cause ogg_read_timestamp to fail
because ogg_packet would go into a state where all packets
of stream 1 would be discarded until the end of the stream.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Fri, 3 Feb 2012 21:18:05 +0000 (22:18 +0100)]
adler32: avoid "too big" check in the inner loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Feb 2012 00:09:29 +0000 (01:09 +0100)]
xvid_rc: check that write() succeeded.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Feb 2012 01:14:54 +0000 (02:14 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: remove debug message in dsputil_init().
movdec: Avoid av_malloc(0) in stss
build: Drop YASM-OBJS-FFT from SUBDIR_VARS.
build: Drop unused X86-OBJS variable.
avconv: remove debugging cruft from do_video_out().
avconv: factorize setting stream_index for the output packet.
frame{crc/md5}: set the stream timebase from codec timebase.
apedec: remove unneeded #include of get_bits.h and associated macro
apedec: av_fast_malloc() instead of av_realloc()
apedec: fix handling of packet sizes that are not a multiple of 4 bytes
Conflicts:
libavcodec/apedec.c
tests/ref/fate/4xm-1
tests/ref/fate/4xm-2
tests/ref/fate/aasc
tests/ref/fate/armovie-escape124
tests/ref/fate/bethsoft-vid
tests/ref/fate/cljr
tests/ref/fate/creatureshock-avs
tests/ref/fate/cscd
tests/ref/fate/cvid-partial
tests/ref/fate/deluxepaint-anm
tests/ref/fate/dfa1
tests/ref/fate/dfa10
tests/ref/fate/dfa11
tests/ref/fate/dfa2
tests/ref/fate/dfa3
tests/ref/fate/dfa4
tests/ref/fate/dfa5
tests/ref/fate/dfa6
tests/ref/fate/dfa7
tests/ref/fate/dfa8
tests/ref/fate/dfa9
tests/ref/fate/film-cvid-pcm-stereo-8bit
tests/ref/fate/flic-af11-palette-change
tests/ref/fate/flic-magiccarpet
tests/ref/fate/fraps-v2
tests/ref/fate/fraps-v3
tests/ref/fate/h264-lossless
tests/ref/fate/interplay-mve-16bit
tests/ref/fate/interplay-mve-8bit
tests/ref/fate/mimic
tests/ref/fate/motionpixels
tests/ref/fate/mpeg2-field-enc
tests/ref/fate/msvideo1-16bit
tests/ref/fate/mtv
tests/ref/fate/nuv
tests/ref/fate/pictor
tests/ref/fate/prores-alpha
tests/ref/fate/ptx
tests/ref/fate/qtrle-16bit
tests/ref/fate/qtrle-1bit
tests/ref/fate/quickdraw
tests/ref/fate/rpza
tests/ref/fate/sierra-vmd
tests/ref/fate/targa-conformance-CCM8
tests/ref/fate/targa-conformance-UCM8
tests/ref/fate/tiertex-seq
tests/ref/fate/truemotion1-15
tests/ref/fate/truemotion1-24
tests/ref/fate/tscc-15bit
tests/ref/fate/tscc-32bit
tests/ref/fate/v210
tests/ref/fate/vc1-ism
tests/ref/fate/vc1_sa00040
tests/ref/fate/vc1_sa00050
tests/ref/fate/vc1_sa10091
tests/ref/fate/vc1_sa20021
tests/ref/fate/vmnc-16bit
tests/ref/fate/vmnc-32bit
tests/ref/fate/vp5
tests/ref/fate/vp8-sign-bias
tests/ref/fate/vqa-cc
tests/ref/fate/wmv8-drm
tests/ref/fate/yop
tests/ref/fate/zmbv-8bit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Feb 2012 00:01:56 +0000 (01:01 +0100)]
apedec: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 Feb 2012 23:44:15 +0000 (00:44 +0100)]
zmbv: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Fri, 3 Feb 2012 20:23:49 +0000 (21:23 +0100)]
Fix png decoding on x86.
Line sizes are only 8-byte aligned, so use unaliged loads
for add_bytes_l2 pointers.
Increasing the alignment requirement to 16 seemed a bit extreme
(png may be used for rather small sizes).
Also fix a mov that had its arguments swapped, leading
add_bytes_l2 being applied on up to 8 bytes too few.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Justin Ruggles [Wed, 10 Aug 2011 13:39:43 +0000 (09:39 -0400)]
dsputil: remove debug message in dsputil_init().
AVCodecContext.bits_per_raw_sample is used for audio too, and values other
than 8, 9, and 10 are valid.
Reimar Döffinger [Fri, 3 Feb 2012 19:34:56 +0000 (20:34 +0100)]
Fix NASM compilation.
movd needs explicit register size prefix for NASM.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Vincent Torri [Sun, 29 Jan 2012 09:45:22 +0000 (10:45 +0100)]
Remove some warnings when compiling with mingw (mingw-w64, 32 bits)
Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alex Converse [Fri, 3 Feb 2012 18:43:21 +0000 (10:43 -0800)]
movdec: Avoid av_malloc(0) in stss
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Ramiro Polla [Fri, 3 Feb 2012 16:55:20 +0000 (14:55 -0200)]
dshow: use DirectShow information to set time_base
Fixes build after removal of AVFormatParameters.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ramiro Polla [Fri, 3 Feb 2012 16:50:19 +0000 (14:50 -0200)]
dshow: fix AVInputFormat declaration after ABI breakage
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 2 Feb 2012 22:39:23 +0000 (23:39 +0100)]
build: Drop YASM-OBJS-FFT from SUBDIR_VARS.
FFT code only appears in libavcodec, so there is no need to reset the variable
when the build templates are instantiated for other libraries.
Diego Biurrun [Thu, 2 Feb 2012 22:37:30 +0000 (23:37 +0100)]
build: Drop unused X86-OBJS variable.
Anton Khirnov [Wed, 1 Feb 2012 09:25:19 +0000 (10:25 +0100)]
avconv: remove debugging cruft from do_video_out().
Anton Khirnov [Wed, 1 Feb 2012 09:23:28 +0000 (10:23 +0100)]
avconv: factorize setting stream_index for the output packet.
Anton Khirnov [Thu, 2 Feb 2012 13:20:43 +0000 (14:20 +0100)]
frame{crc/md5}: set the stream timebase from codec timebase.
Right now those muxers use the default timebase in all cases(1/90000).
This patch avoid unnecessary rescaling and makes the printed timestamps
more readable.
Also, extend the printed information to include the timebases and packet
pts/duration and align the columns.
Obviously changes the results of all fate tests which use those two
muxers.
Michael Niedermayer [Fri, 3 Feb 2012 01:41:47 +0000 (02:41 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx264: fix indentation.
vorbis: fix overflows in floor1[] vector and inverse db table index.
win64: add a XMM clobber test configure option.
movdec: Parse the dvc1 atom
ARM: ac3: fix ac3_bit_alloc_calc_bap_armv6
swscale: K&R formatting cosmetics for Blackfin code
frwu: lowercase the FRWU codec name
movdec: fix dts generation in fragmented files
fate: make acodec-ac3_fixed test output raw AC3
APIchanges: add missing commit hashes
swscale: implement MMX, SSE2 and AVX functions for RGB32 input.
ra144enc: drop pointless "encoder" from .long_name
bethsoftvideo: fix palette reading.
mpc7: use av_fast_padded_malloc()
mpc7: simplify handling of packet sizes that are not a multiple of 4 bytes
doc: decoding Forward Uncompressed is supported
Fix a typo in the x86 asm version of ff_vector_clip_int32()
pcmenc: Do not set avpkt->size.
ff_alloc_packet: modify the size of the packet to match the requested size
Conflicts:
doc/APIchanges
libavcodec/libx264.c
libavcodec/mpc7.c
libavformat/isom.h
libswscale/Makefile
libswscale/bfin/yuv2rgb_bfin.c
tests/ref/fate/bethsoft-vid
tests/ref/seek/ac3_ac3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Thu, 2 Feb 2012 01:14:42 +0000 (20:14 -0500)]
apedec: remove unneeded #include of get_bits.h and associated macro
Justin Ruggles [Mon, 30 Jan 2012 19:57:21 +0000 (14:57 -0500)]
apedec: av_fast_malloc() instead of av_realloc()
av_realloc() does not guarantee alignment, which is required for
DSPContext.bswap_buf().
Justin Ruggles [Thu, 2 Feb 2012 01:11:36 +0000 (20:11 -0500)]
apedec: fix handling of packet sizes that are not a multiple of 4 bytes
Clément Bœsch [Thu, 2 Feb 2012 23:56:27 +0000 (00:56 +0100)]
lavu/timecode: use @see for URL in doxygen.
Clément Bœsch [Thu, 2 Feb 2012 23:55:37 +0000 (00:55 +0100)]
lavfi/thumbnail: rename @url to @see.
@url isn't a valid Doxygen directive.
Anton Khirnov [Wed, 1 Feb 2012 09:56:14 +0000 (10:56 +0100)]
libx264: fix indentation.
KO Myung-Hun [Thu, 2 Feb 2012 06:29:39 +0000 (15:29 +0900)]
Use SECTION_TEXT instead of section .text for the compatibility
aout does not support 'align='.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 2 Feb 2012 17:49:10 +0000 (17:49 +0000)]
ffv1: cosmetics: indentation
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Wed, 11 Jan 2012 01:01:26 +0000 (17:01 -0800)]
vorbis: fix overflows in floor1[] vector and inverse db table index.
Ronald S. Bultje [Thu, 2 Feb 2012 19:48:13 +0000 (11:48 -0800)]
win64: add a XMM clobber test configure option.
This will be useful to test more aggressively for failures to mark XMM
registers as clobbered in Win64 builds, and prevent regressions thereof.
Based on a patch by Ramiro Polla <ramiro.polla@gmail.com>
Clément Bœsch [Thu, 2 Feb 2012 19:15:17 +0000 (20:15 +0100)]
dct-test: remove odivx_idct_c dead prototype.
Martin Storsjö [Sat, 21 Jan 2012 23:32:16 +0000 (01:32 +0200)]
movdec: Parse the dvc1 atom
Normally, the actual payload data contains sequence headers, too,
and the parser can extract this and set it as extradata. However,
the data in the dvc1 atom is the "official" extradata for the file.
This is required for proper stream copy of vc1 from ismv to ismv.
Signed-off-by: Martin Storsjö <martin@martin.st>
Mans Rullgard [Wed, 1 Feb 2012 22:25:10 +0000 (22:25 +0000)]
ARM: ac3: fix ac3_bit_alloc_calc_bap_armv6
This function was broken when the start bin was not at the start
of a band.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diego Biurrun [Wed, 18 Jan 2012 22:56:49 +0000 (23:56 +0100)]
swscale: K&R formatting cosmetics for Blackfin code
Also prettyprint some comments in Assembly code.
Piotr Bandurski [Wed, 1 Feb 2012 20:23:33 +0000 (20:23 +0000)]
frwu: lowercase the FRWU codec name
This is more consistent with all the other codec names.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Carl Eugen Hoyos [Thu, 2 Feb 2012 17:44:39 +0000 (18:44 +0100)]
Cosmentics: Fix AVUI comment.
The codec contains no alpha information but deinterleaved interlaced video.
Found by Maksym Veremeyenko.
Janne Grunau [Thu, 2 Feb 2012 15:30:27 +0000 (16:30 +0100)]
movdec: fix dts generation in fragmented files
Do not use AVStream's duration for dts generation since it contains in
some cases the duration of the whole file instead of duration of the
samples in the moov. This happens if the mdhd holds the duration of the
whole file but has no entries or a zero duration in its stts.
Mans Rullgard [Thu, 2 Feb 2012 01:46:05 +0000 (01:46 +0000)]
fate: make acodec-ac3_fixed test output raw AC3
There is no point in this test using the RM format.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Clément Bœsch [Wed, 1 Feb 2012 14:53:54 +0000 (15:53 +0100)]
lavfi/amerge: copy ref props after filtering samples.
This fixes various issues with ffmpeg -ss and -t.
Clément Bœsch [Tue, 31 Jan 2012 07:20:42 +0000 (08:20 +0100)]
lavfi/pan: copy ref props after filtering samples.
At least PTS needs to be copied to avoid breaking options such as -t in
ffmpeg.
Clément Bœsch [Thu, 26 Jan 2012 07:49:15 +0000 (08:49 +0100)]
lavfi/aconvert: use libswresample.
This commit also drops the planar parameter; you now need to use the 'p'
suffix in order to request a planar sample format.
Clément Bœsch [Sat, 21 Jan 2012 19:26:31 +0000 (20:26 +0100)]
lavfi/aresample: use libswresample.
Clément Bœsch [Thu, 26 Jan 2012 08:43:17 +0000 (09:43 +0100)]
lavfi/aformat: use do..while(0) form for macro.
This avoids some empty statements.
Clément Bœsch [Tue, 10 Jan 2012 10:47:46 +0000 (11:47 +0100)]
doc: document amerge filter as an alternative for the -map_channel limitation.
Clément Bœsch [Mon, 16 Jan 2012 16:04:04 +0000 (17:04 +0100)]
timecode: drop lavc timecode on next bump.
Clément Bœsch [Mon, 16 Jan 2012 12:43:42 +0000 (13:43 +0100)]
dvenc: use new public timecode API.
Clément Bœsch [Mon, 16 Jan 2012 13:19:37 +0000 (14:19 +0100)]
mxfenc: use new public timecode API.
Clément Bœsch [Mon, 16 Jan 2012 15:10:22 +0000 (16:10 +0100)]
gxfenc: use new public timecode API.
Clément Bœsch [Mon, 16 Jan 2012 13:45:46 +0000 (14:45 +0100)]
mpeg12enc: use new public timecode API.
Clément Bœsch [Mon, 16 Jan 2012 10:41:39 +0000 (11:41 +0100)]
drawtext: use new public timecode API.
Clément Bœsch [Tue, 31 Jan 2012 10:44:27 +0000 (11:44 +0100)]
dv: use new public timecode API.
Clément Bœsch [Tue, 31 Jan 2012 09:52:47 +0000 (10:52 +0100)]
mov: honor tmcd flags while extracting timecode meta.
Clément Bœsch [Mon, 23 Jan 2012 14:10:43 +0000 (15:10 +0100)]
mov: use new public timecode API.
Clément Bœsch [Mon, 16 Jan 2012 10:30:05 +0000 (11:30 +0100)]
mpeg12: use av_mpegtc_to_timecode_string().
Clément Bœsch [Mon, 16 Jan 2012 10:24:52 +0000 (11:24 +0100)]
ffprobe: use av_mpegtc_to_timecode_string().
Clément Bœsch [Mon, 16 Jan 2012 10:20:46 +0000 (11:20 +0100)]
lavu: add public timecode API.
Janne Grunau [Wed, 1 Feb 2012 18:22:54 +0000 (19:22 +0100)]
APIchanges: add missing commit hashes
Clément Bœsch [Mon, 23 Jan 2012 13:48:08 +0000 (14:48 +0100)]
timecode: add write regressions tests.
Carl Eugen Hoyos [Thu, 2 Feb 2012 12:29:14 +0000 (13:29 +0100)]
Use the correct pix_fmt for 32bit x11grab.
Remove adding a constant value to each pixel to make it opaque.
Ronald S. Bultje [Thu, 2 Feb 2012 05:55:32 +0000 (21:55 -0800)]
swscale: implement MMX, SSE2 and AVX functions for RGB32 input.
Paul B Mahol [Thu, 2 Feb 2012 01:56:32 +0000 (01:56 +0000)]
cosmetics: realign vertically
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 2 Feb 2012 03:34:28 +0000 (04:34 +0100)]
apedec: Fix alignment and fate.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 2 Feb 2012 01:02:18 +0000 (02:02 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
frwu: Employ more meaningful return values.
fraps: Use av_fast_padded_malloc() instead of av_realloc()
mjpegdec: use av_fast_padded_malloc()
eatqi: use av_fast_padded_malloc()
asv1: use av_fast_padded_malloc()
avcodec: Add av_fast_padded_malloc().
swscale: enable dithering in MMX functions.
swscale: make rgb24 function macros slightly smaller.
avcodec.h: Remove some disabled cruft.
swscale: remove obsolete comment.
swscale-test: Drop unused argc and argv arguments from main().
zmbv: Employ more meaningful return values.
zmbvenc: Employ more meaningful return values.
vc1: prevent null pointer dereference on broken files
zmbv: check av_realloc() return values and avoid memleaks on ENOMEM
truespeech: align buffer
ac3: Do not read past the end of ff_ac3_band_start_tab.
dv: Fix small stack overread related to CVE-2011-3929 and CVE-2011-3936.
dv: Fix null pointer dereference due to ach=0
dv: check stype
...
Conflicts:
doc/APIchanges
libavcodec/asv1.c
libavcodec/avcodec.h
libavcodec/eatqi.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/zmbv.c
libavformat/dv.c
libswscale/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 2 Feb 2012 01:10:19 +0000 (01:10 +0000)]
ra144enc: drop pointless "encoder" from .long_name
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Justin Ruggles [Wed, 18 Jan 2012 18:09:43 +0000 (13:09 -0500)]
bethsoftvideo: fix palette reading.
Return the correct number of consumed bytes and set *data_size = 0.
Returned size is 1 too small, leading to that 1 byte being read as the next
frame, which results in an extra blank frame at the beginning of the stream.
Justin Ruggles [Tue, 31 Jan 2012 16:17:04 +0000 (11:17 -0500)]
mpc7: use av_fast_padded_malloc()
Avoids doing malloc/free for each frame.
Also fixes valgrind errors due to use of uninitialized padding bytes.
Based on a patch by Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Justin Ruggles [Wed, 1 Feb 2012 20:19:50 +0000 (15:19 -0500)]
mpc7: simplify handling of packet sizes that are not a multiple of 4 bytes
Paul B Mahol [Wed, 1 Feb 2012 20:30:33 +0000 (20:30 +0000)]
doc: decoding Forward Uncompressed is supported
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Michael Niedermayer [Sun, 29 Jan 2012 04:04:25 +0000 (05:04 +0100)]
diracdec: Check for negative quants which would cause out of array reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 29 Jan 2012 03:39:37 +0000 (04:39 +0100)]
proresdec: Fix read via negative index in a global array.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 1 Feb 2012 21:25:06 +0000 (21:25 +0000)]
doc: ffv1 is not experimental any more
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Thu, 2 Feb 2012 00:02:32 +0000 (19:02 -0500)]
Fix a typo in the x86 asm version of ff_vector_clip_int32()
Specifies the correct number of xmm registers used so that they can be saved
and restored on Win64 if necessary.
Justin Ruggles [Wed, 1 Feb 2012 21:26:37 +0000 (16:26 -0500)]
pcmenc: Do not set avpkt->size.
It is already the correct size as set by ff_alloc_packet().
Justin Ruggles [Wed, 1 Feb 2012 21:23:19 +0000 (16:23 -0500)]
ff_alloc_packet: modify the size of the packet to match the requested size
This will simplify encoders which use this function to request the exact
packet size rather than the maximum size.
Paul B Mahol [Wed, 1 Feb 2012 21:05:16 +0000 (21:05 +0000)]
frwu: Employ more meaningful return values.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Reimar Döffinger [Tue, 31 Jan 2012 16:30:34 +0000 (11:30 -0500)]
fraps: Use av_fast_padded_malloc() instead of av_realloc()
Ensures alignment and avoids using uninitialized data.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Reimar Döffinger [Mon, 30 Jan 2012 23:35:35 +0000 (18:35 -0500)]
mjpegdec: use av_fast_padded_malloc()
also check for allocation failure
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Reimar Döffinger [Mon, 30 Jan 2012 23:34:10 +0000 (18:34 -0500)]
eatqi: use av_fast_padded_malloc()
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>