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
Michael Niedermayer
35aaa306ac
swr: make the default of nopts for first_pts actually work
...
Fixes Ticket2210
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
7f2ab129b1
fate: force a first_pts=0 for the aresample test
...
This is needed to prevent the next commit from breaking fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
e42028925b
ffmpeg: Force a first_pts of 0 for the first configuration of -async use
...
This is very close to what the default does currently
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Stefano Sabatini
394130efe3
ffplay: reindent and remove pointless cast in audio_decode_frame() code
12 years ago
Stefano Sabatini
a3fa27e366
ffplay: set type for channel_layout AudioParams field to int64_t
...
Reflect the type of the corresponding field in lavc/lavfi.
12 years ago
Stefano Sabatini
566560b85c
lavfi/abuffersink: fix weird indent and spacing
12 years ago
Stefano Sabatini
b59cd089ff
lavfi/abuffersink: add sample_rates field to AVABufferSinkParams
...
Allow to select sample rates.
12 years ago
Stefano Sabatini
5085b46496
lavc: change type of AVFrame.channels field from int64_t to int
...
"channels" is an int in all the other places in the libraries, and the
av_frame_*_channels() accessors return and set an int, so this should not
implicate ABI breaks.
12 years ago
Michael Niedermayer
ad899522ff
ffmpeg: use a AVDictionary instead of the context to move swr parameters around
...
This avoids per parameter changes in ffmpeg at the cost of making access
somewhat more annoying.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
f3abdf4392
cmdutils: fix null pointer dereference
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
8b3affda87
swr: support a seperate output sample bits.
...
This avoids user apps having to mangle dither scale. for pcm24
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
c4c702b6d3
avfilter/avfiltergraph.h: Move public field out of the private fields
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
2abbe6d07a
swr: add duplicate cutoff for compatibility
...
Based on
commit 50f4337a2f
Author: Justin Ruggles <justin.ruggles@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Paul B Mahol
8a7d177cf6
fate: add animated gif decoder tests
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago