Michael Niedermayer
cdb9752a0f
Merge commit '845cfc92f908791714b8c4c8a49c91b8c64b685e'
...
* commit '845cfc92f908791714b8c4c8a49c91b8c64b685e':
x86: dsputil: Drop aliasing of ff_put_pixels8_mmx to ff_put_pixels8_mmxext
Conflicts:
libavcodec/x86/dsputil_mmx.c
Note, the commit message is wrong, there are no mmxext instructions as
claimed in the function. The change should do no harm though
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
04ec796bda
Merge commit '096cc11ec102701a18951b4f0437d609081ca1dd'
...
* commit '096cc11ec102701a18951b4f0437d609081ca1dd':
x86: vc1dsp: Move ff_avg_vc1_mspel_mc00_mmxext out of dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
f2bbc2ffc3
Merge commit '31a23a0dc663bd42bf593275971b4277a479b73d'
...
* commit '31a23a0dc663bd42bf593275971b4277a479b73d':
x86: dsputil_mmx: Remove leftover inline assembly fragments
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
5d2f2c7643
oggdec: chained oggs have timestamp discontinuities
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
0dcecf45d8
avcodec: mbd has a range of 0..2
...
Fixes Ticket2219
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
1672624ddc
mpegvideo_enc: fix gray flag with 444 jpeg
...
Fixes Ticket2155
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Jean First
2d7044683f
ffmpeg_opt: add -to option to specify stop time
...
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Diego Biurrun
ebc701993f
x86: dsputil: Drop some unused function #defines
12 years ago
Diego Biurrun
845cfc92f9
x86: dsputil: Drop aliasing of ff_put_pixels8_mmx to ff_put_pixels8_mmxext
...
The external assembly function uses mmxext instructions and should not be
masqueraded as an mmx-only function. Instead, use the mmx-only inline
assembly function.
12 years ago
Diego Biurrun
096cc11ec1
x86: vc1dsp: Move ff_avg_vc1_mspel_mc00_mmxext out of dsputil_mmx.c
12 years ago
Martin Storsjö
31a23a0dc6
x86: dsputil_mmx: Remove leftover inline assembly fragments
...
These became unused in 71155d7b
.
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Michael Niedermayer
997a36238f
mpeg12: Detect MXF essence stuff at the end of frames
...
Fixes some of the issues with segment.mov
See: 0226 15:16 Joseph Artsimov (2.1K) [FFmpeg-devel] Two problems with MPEG2 decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
e4eedb983d
swscale-test: fix 3 pointer type warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
c6d3b3be15
aacsbr: Silence warning: max_qmf_subbands may be used uninitialized in this function
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
e907aa98cd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: icc: Drop nonsense adding of cpuflags to LDFLAGS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
a984efd104
Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'
...
* commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f':
Remove unnecessary dsputil.h #includes
Conflicts:
libavcodec/ffv1.c
libavcodec/h261dec.c
libavcodec/h261enc.c
libavcodec/h264pred.c
libavcodec/lpc.h
libavcodec/mjpegdec.c
libavcodec/rectangle.h
libavcodec/x86/idct_sse2_xvid.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
9b1a0c2ee8
Merge commit '76b19a3984359b3be44d4f7e4e69b7b86729a622'
...
* commit '76b19a3984359b3be44d4f7e4e69b7b86729a622':
Fix a number of incorrect intmath.h #includes.
avconv: remove an unused variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
6fbddc80d6
Merge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655'
...
* commit 'e8da807537e314d74cb6d93598f1dcfb891fa655':
cmdutils: only use libavresample when it is enabled
libschroedinger: cosmetics: rename variable avccontext to avctx
vorbisenc: cosmetics: rename variable avccontext to avctx
Conflicts:
cmdutils.c
libavcodec/libschroedinger.c
libavcodec/libschroedingerenc.c
libavcodec/vorbisenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
13fa074173
Merge commit 'e951b6d94c441d46b396ef12da1428297d77251d'
...
* commit 'e951b6d94c441d46b396ef12da1428297d77251d':
vorbisdec: cosmetics: rename variable avccontext to avctx
configure: Identify icc compiler with a less ambiguous pattern
Conflicts:
libavcodec/vorbisdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
2b277f2992
Merge commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47'
...
* commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47':
configure: Separate "ln" command line arguments
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
f6fff8e546
ac3enc_template: silence may be used uninitialized in this function warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
5bcb379ffe
motion-test: fix warning: dsp_mask is deprecated
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
bfcc21a472
libavcodec/motion-test: set the bitexact flag
...
this is needed for testing mmx2 functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Diego Biurrun
3a02b6884c
configure: icc: Drop nonsense adding of cpuflags to LDFLAGS
...
This fixes many icc warnings when not setting the CPU type.
12 years ago
Diego Biurrun
c242bbd8b6
Remove unnecessary dsputil.h #includes
12 years ago
Diego Biurrun
76b19a3984
Fix a number of incorrect intmath.h #includes.
12 years ago
Justin Ruggles
d925cca95f
avconv: remove an unused variable
12 years ago
Justin Ruggles
e8da807537
cmdutils: only use libavresample when it is enabled
...
avprobe and avserver use cmdutils and do not strictly require libavresample.
12 years ago
Justin Ruggles
e951b6d94c
vorbisdec: cosmetics: rename variable avccontext to avctx
...
This is consistent with the rest of libavcodec.
12 years ago
Justin Ruggles
699d02b839
libschroedinger: cosmetics: rename variable avccontext to avctx
...
This is consistent with the rest of libavcodec.
12 years ago
Justin Ruggles
09031b4639
vorbisenc: cosmetics: rename variable avccontext to avctx
...
This is consistent with the rest of libavcodec.
12 years ago
slhck
bfcc38ef48
libvpx: check if CQ level is in correct bounds
...
Check whether CQ level is within qmin..qmax and abort on error. If this isn't properly
set, encoding will fail at the first frame.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
slhck
188947c32a
libvpx: allow 0 as min quantizer value
...
Allow setting the min quantizer to 0 instead of 1 (libvpx allows 0); fixes #2136
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Jean First
af0e8144cd
ffmpeg_opt: cosmetics
...
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
e6f27346b7
pmpdec: make i unsigned, avoid undefined behavior of i++
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
a960f3b918
pmpdec: fix integer overflow
...
Its unlikely this affects any valid files.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Diego Biurrun
b2d688ea9f
configure: Identify icc compiler with a less ambiguous pattern
12 years ago
Diego Biurrun
b58b00aeca
configure: Separate "ln" command line arguments
...
This is more compatible and not more complicated.
12 years ago
Paul B Mahol
b8f6912816
fate: update pixfmts_hflip
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
e0ccb5fa38
lavfi/hflip: support more formats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
eac93932b0
lavfi/geq: improve support for formats with alpha plane
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Michael Niedermayer
875f883185
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vorbisdec: Accept 0 amplitude_bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
f7dc6aa5fe
Merge commit '5b47c19bfda92273ae49e83db26a565afcaed80a'
...
* commit '5b47c19bfda92273ae49e83db26a565afcaed80a':
vorbisdec: Add missing checks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
a0312a2e85
Merge commit 'fc386f2eea8d93ecd4f81e1646c835d1645c56a0'
...
* commit 'fc386f2eea8d93ecd4f81e1646c835d1645c56a0':
vorbisdec: cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
cb72f698fe
Merge commit '11dcecfcca0eca1a571792c4fa3c21fb2cfddddc'
...
* commit '11dcecfcca0eca1a571792c4fa3c21fb2cfddddc':
vorbisdec: Error on bark_map_size equal to 0.
dsputil_alpha.h: Add missing stddef.h header to fix standalone compilation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Luca Barbato
23bd9ef4b2
vorbisdec: Accept 0 amplitude_bits
...
The specification does not prevent an encoder to write the amplitude 0
as 0 amplitude_bits.
Our get_bits() implementation might not support a zero sized read
properly, thus the additional branch.
12 years ago
Luca Barbato
5b47c19bfd
vorbisdec: Add missing checks
...
Rate and order must not be 0 even if the specification does not say that
explicitly.
12 years ago
Luca Barbato
fc386f2eea
vorbisdec: cosmetics
...
Use the commonly used "if (!var)" instead of "if (var == 0)".
12 years ago
Michael Niedermayer
11dcecfcca
vorbisdec: Error on bark_map_size equal to 0.
...
The value is used to calculate output LSP curve and a division by zero
and out of array accesses would occur.
CVE-2013-0894
CC: libav-stable@libav.org
Reported-by: Dale Curtis <dalecurtis@chromium.org>
Found-by: inferno@chromium.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years ago
Michael Niedermayer
bb7bc3443d
af_biquads: memset(0) cache
...
Fixes valgrind warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago