diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-04 14:30:25 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-04 14:30:25 +0400 |
| commit | 741f5b021a0494676de0dab543f8a9591ec2e01e (patch) | |
| tree | 51b8243f64192e37c61bf03d18a25f40fd4c0d6d /libavfilter/vf_overlay.c | |
| parent | 047dcfabc7e8932490836be94ef3b2ecc8289ab0 (diff) | |
| parent | 29abb04e73b0580ebe38703cadb988d26df6a76a (diff) | |
Merge commit '29abb04e73b0580ebe38703cadb988d26df6a76a'
* commit '29abb04e73b0580ebe38703cadb988d26df6a76a':
libspeexdec: If the channel count is not valid, decode as stereo.
libspeexdec: improve setting of Speex mode and sample rate
libspeex: Add a private option for enabling VAD
xtea: Test inplace decryption
xtea: Fix CBC decryption when src==dst
xtea: Factorize testing into a separate function
configure: Refactor HAVE_ options available on the command line
avconv/avprobe: Add missing 'void' to exit_program() definition
Allow use of strncpy()
blowfish: Add more tests
blowfish: Fix CBC decryption with dst==src
blowfish: Factorize testing into a separate function
Conflicts:
configure
libavcodec/libspeexdec.c
libavutil/xtea.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_overlay.c')
0 files changed, 0 insertions, 0 deletions