Anton Khirnov
380232fac3
snow: fix build after 594d4d5df3
12 years ago
Michael Niedermayer
857d7194ca
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
h264: add a pointer for weighted prediction temporary buffer
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Paul B Mahol
6777aa6387
lavc/takdec: s/get_b/get_bits_esc4
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Martin Storsjö
4ed0c35c40
avcodec: Fix a typo in an option description
...
Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
12 years ago
Paul B Mahol
1c779854b5
lavc/takdec: simplify code
...
Merge get_scale/get_shift into set_sample_rate_params().
Rename tak_set_bps to set_bps_params and remove 2nd argument.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Michael Niedermayer
7c425e4f2d
Merge commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333'
...
* commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333':
h264: check sps.log2_max_frame_num for validity
mov: validate number of DataReferenceBox entries against box size
mov: compute avg_frame_rate only if duration is known
flac: change minimum and default of lpc_passes option to 1
Conflicts:
libavcodec/h264_ps.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
af164d7d9f
Merge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152'
...
* commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152':
fate: dpcm: Add dependencies
SBR DSP x86: implement SSE sbr_hf_gen
AAC SBR: use AVFloatDSPContext's vector_fmul
fate: image: Add dependencies
Changelog: add an entry for deprecating the avconv -vol option
x86: float_dsp: fix compilation of ff_vector_dmul_scalar_avx() on x86-32
Conflicts:
Changelog
libavutil/x86/float_dsp.asm
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Mans Rullgard
92dad6687f
arm: fix use of uninitialised value in ff_fft_fixed_init_arm()
...
When initialising an FFTContext for a plain FFT, mdct_bits is not set
and can contain a garbage value. Since nbits is always valid and for
MDCT operation is mdct_bits - 2 checking this instead avoids using an
uninitialised value while having the same effect.
Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years ago
Paul B Mahol
8ca8b43d71
lavf/pcm: check size, do not produce invalid packets
...
Inspired by 92b8c9d89e
.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Michael Niedermayer
ea6da80cb4
diracdec: check dimensions against chroma format.
...
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Martin Storsjö
2c96392277
avpicture: Don't assume a valid pix fmt in avpicture_get_size
...
When called from the v4l2 input device, pix_fmt can be
AV_PIX_FMT_NONE (for jpeg formats). Before 50ba57e0
, this wasn't
an issue for avpicture_get_size, but after that commit, this
lead to crashes.
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Janne Grunau
a394959bbe
h264: add a pointer for weighted prediction temporary buffer
...
Reusing MpegEncContext's obmc_scratchpad for this becomes a mess with
adaptive frame-mt.
12 years ago
Janne Grunau
d7d6efe42b
h264: check sps.log2_max_frame_num for validity
...
Fixes infinite or long taking loop in frame num gap code in
the fuzzed sample bipbop234.ts_s223302.
CC: libav-stable@libav.org
12 years ago
Janne Grunau
8cc2fa1e5d
mov: validate number of DataReferenceBox entries against box size
...
Avoids a 2G memory allocation and parsing of random data in
mov_read_dref(). The fuzzed sample sample.mp4_s224424 triggers this.
12 years ago
Janne Grunau
80b6b31417
mov: compute avg_frame_rate only if duration is known
...
Fixes an assert in fuzzed sample sample.mp4_s265930.
12 years ago
Janne Grunau
480be07a96
flac: change minimum and default of lpc_passes option to 1
...
Avoid use of uninitialized and uncomputed linear least square models
during ff_lpc_calc_coefs() for FF_LPC_TYPE_CHOLESKY. Fixes running
make fate-flac-16-lpc-cholesk with valgrind --undef-value-errors=yes.
12 years ago
Diego Biurrun
c25fc5c2bb
fate: dpcm: Add dependencies
12 years ago
Christophe Gisquet
2aef3d66c9
SBR DSP x86: implement SSE sbr_hf_gen
...
Start and end index are multiple of 2, therefore guaranteeing aligned access.
Also, this allows to generate 4 floats per loop, keeping the alignment all
along.
Timing:
- 32 bits: 326c -> 172c
- 64 bits: 323c -> 156c
Signed-off-by: Diego Biurrun <diego@biurrun.de>
12 years ago
Christophe Gisquet
9a16359c38
AAC SBR: use AVFloatDSPContext's vector_fmul
...
Around 5% speedup on the code block using 'vector_fmul_add's.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
12 years ago
Diego Biurrun
33086f9265
fate: image: Add dependencies
12 years ago
Michael Niedermayer
f5d6b0c9c2
diracdec: fix typo in mctmp allocation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
2f6ec9fdd7
diracdec: Test mctmp and mcscratch for malloc failure.
...
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
b84d1bf193
diracdec: fix emulated_edge condition, fix out of array reads
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Paul B Mahol
f8d68822c0
takdec: use samplefmt.h from libavutil
...
Instead of having own code for calculating decoded buffer size
just use already provided functions from libavutil.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
6a7fed193c
add missing dependency for tak demuxer
12 years ago
Paul B Mahol
4e4a95b18e
takdec: remove get_code() and use get_sbits() directly
...
As found by Justin, this is probably bug in reference decoder.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Carl Eugen Hoyos
24b20087bd
Fix compilation with yasm 0.6.2.
12 years ago
Michael Niedermayer
892750b07b
fix tipo
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Stefano Sabatini
da9a45b681
lavfi/tinterlace: drop redundant NULL checks in uninit()
12 years ago
Stefano Sabatini
c6a216771f
lavfi/tinterlace: add support to option parsing
...
Simplify code, and provide introspection through the AVOption system.
12 years ago
Stefano Sabatini
fef7b2e0be
lavfi/tinterlace: switch to filter_frame API
...
Also add missing NULL checks.
12 years ago
Michael Niedermayer
656500c503
lavf: improve help text for avoid_negative_ts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
4b6869d6e0
bitstream: make vlc init of static tables thread safe.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Clément Bœsch
bbd44f6ca4
lavfi/mp: switch to ff_filter_frame.
12 years ago
Paul B Mahol
586c2528a0
dxa: port to bytestream2 API
...
Protects against overreads in input buffer.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
547b8aeed4
smacker: use meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
29c3ebf56e
siff: return meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
7510a9a466
lavf/apedec: return meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
4d1912ff4d
huffyuv: return meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
4a722a5cab
huffyuv: check for malloc failures
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Justin Ruggles
b64ba37c4c
Changelog: add an entry for deprecating the avconv -vol option
12 years ago
Paul B Mahol
7f261ac850
huffyuv: make use of av_fast_padded_malloc()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Clément Bœsch
eaa47e7454
lavfi/deshake: small align prettifying.
12 years ago
Clément Bœsch
03778575b9
lavfi/deshake: switch inverted comments.
12 years ago
Clément Bœsch
0678641b7c
lavfi/deshake: remove unecessary check before unref.
12 years ago
Clément Bœsch
e7b0e83e96
lavfi/deshake: switch to filter_frame.
12 years ago
Michael Niedermayer
71949ef715
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
h264: slice-mt: check master context for valid current_picture_ptr
h264: slice-mt: get last_pic_dropable from master context
alacenc: add support for multi-channel encoding
Conflicts:
Changelog
libavcodec/alac.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
54a71f2e6c
Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'
...
* commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56':
pixdesc: fix yuva 10bit bit depth
avconv: deprecate the -vol option
x86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scaling
x86: af_volume: add SSE2-optimized s16 volume scaling
Conflicts:
ffmpeg.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
1bb547192f
lavfi: rename af_volume to af_volume_stefano
...
This matches the naming style of the new af_volume_justin filter.
Note, Yes i would too prefer having one filter instead of 2.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
b38c79bf23
Merge commit 'b384e031daeb1ac612620985e3e5377bc587559c'
...
* commit 'b384e031daeb1ac612620985e3e5377bc587559c':
lavfi: add volume filter
Conflicts:
Changelog
libavfilter/Makefile
libavfilter/af_volume.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago