Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-05-11Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'Derek Buitenhuis
* commit 'd12b5b2f135aade4099f4b26b0fe678656158c13': build: Split test programs off into separate files Some conversions done by: James Almer <jamrial@gmail.com> Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-07build: Split test programs off into separate filesDiego Biurrun
This avoids spurious library rebuilds when only the test program code is changed and simplifies the build system.
2015-11-22Merge commit '588b6215b4c74945994eb9636b0699028c069ed2'Derek Buitenhuis
* commit '588b6215b4c74945994eb9636b0699028c069ed2': rtmpcrypt: Do the xtea decryption in little endian mode xtea: Add functions for little endian mode Conflicts: libavutil/xtea.c Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-11-13xtea: Add functions for little endian modeMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-10-17avutil: undo FF_API_CRYPTO_CONTEXT deprecationJames Almer
It's been argued that the benefits of the current implementation far outweight those of making the structs opaque. This deprecation is not present in any release, so it can be safely removed. Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
2015-08-02Merge commit '5d8bea3bb2357bb304f8f771a4107039037c5549'Hendrik Leppkes
* commit '5d8bea3bb2357bb304f8f771a4107039037c5549': xtea: add av_xtea_alloc() Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-07-31xtea: add av_xtea_alloc()James Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-04-07xtea: Add Doxy @file and groupTimothy Gu
2013-11-03avutil/xtea: add Doxy @file and groupTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-11Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Drop pointless directory name prefixes from #includes in the current dir Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-10Drop pointless directory name prefixes from #includes in the current dirDiego Biurrun
2013-08-11avutil/xtea: make const tables static constMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29xtea: fix unused variable warning for config_smallMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'Michael Niedermayer
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967': Remove pointless #undefs of previously forbidden functions. fate: Add dependencies for bmp, cdxl, dfa, mp3 Conflicts: doc/examples/muxing.c libavfilter/filtfmts.c libavutil/des.c libavutil/eval.c libavutil/log.c libavutil/parseutils.c tests/fate/mp3.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05Remove pointless #undefs of previously forbidden functions.Anton Khirnov
2012-10-08xtea: give constants the correct typeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-04Merge commit '29abb04e73b0580ebe38703cadb988d26df6a76a'Michael Niedermayer
* 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>
2012-10-03xtea: Test inplace decryptionMichael Niedermayer
Based on test code by: Giorgio Vazzana <mywing81@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-03xtea: Fix CBC decryption when src==dstMichael Niedermayer
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-03xtea: Factorize testing into a separate functionMartin Storsjö
Based on a patch by Michael Niedermayer. Signed-off-by: Martin Storsjö <martin@martin.st>
2012-09-30xtea: fix decryption with --enable-smallGiorgio Vazzana
iv decrypt handling code needs to be executed regardless of CONFIG_SMALL Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-30xtea: move iv decrypt handling code into xtea_crypt_ecb()Michael Niedermayer
this simplifies things are avoids a temporary Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-30xtea-test: test inplace decryptionMichael Niedermayer
Based on test code by: Giorgio Vazzana <mywing81@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-30xtea: fix CBC mode when src=dstGiorgio Vazzana
In CBC mode, when src=dst and we are decrypting a block different from the first one, we need to save the current block of ciphertext (which will constitute the initialization vector for the next block) before we overwrite it. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-30xtea-test: factorize test codeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-11xtea: optimize core, about 4-5% faster.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-05Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: qdm2: remove broken and disabled dump_context() debug function x86: h264_intrapred: use newly introduced SPLAT* and PSHUFLW macros x86inc: add SPLATB_LOAD, SPLATB_REG, PSHUFLW macros x86inc: modify ALIGN to not generate long nops on i586 x86: h264_intrapred: port to cpuflag macros avplay: update input filter pointer when the filtergraph is reset. avconv: fix parsing of -force_key_frames option. h264: use templates to avoid excessive inlining xtea: Make the count parameter match the documentation blowfish: Make the count parameter match the documentation mpegvideo: Don't use ff_mspel_motion() for vc1 xtea: invert branch and loop precedence blowfish: invert branch and loop precedence flvdec: optionally trust the metadata avconv: Set audio filter time base to the sample rate vp8: Add ifdef guards around the sse2 loopfilter in the sse2slow branch too Conflicts: ffmpeg.c ffplay.c libavcodec/h264.c libavcodec/mpegvideo_common.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-05xtea: Make the count parameter match the documentationSamuel Pitoiset
Previously it was interpreted as number of bytes, while the documentation stated that it was the number of 8 byte blocks. This makes it behave similarly to the existing AES code. Signed-off-by: Martin Storsjö <martin@martin.st>
2012-07-05xtea: invert branch and loop precedenceLuca Barbato
Should slightly improve performance depending on the compiler used.
2012-07-04Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (29 commits) lavfi: reclassify showfiltfmts as a TESTPROG graph2dot: fix printf format specifier swscale: yuv2planeX 8bit >=sse2 functions need aligned stack on x86-32. vp8: loopfilter >=sse2 functions need aligned stack on x86-32. amr: remove shift out of the AMR_BIT() macro. dsputilenc: group yasm and inline asm function pointer assignment. mov: use forward declaration of a function instead of a table. Clarify Doxygen comment for FF_API_* #defines. configure: simplify get_version() Create version.h headers for libraries that lack them gitignore: Use full path instead of relative path to specify patterns mpegvideo: remove VLAs Add XTEA encryption support in libavutil Add Blowfish encryption support in libavutil eval: Add the isinf() function and tests for it flacdec: move lpc filter to flacdsp flacdec: split off channel decorrelation as flacdsp avplay: Add an option for not limiting the input buffer size FATE: add a test for WMA cover art. FATE: add a test for apetag cover art ... Conflicts: .gitignore configure ffplay.c libavcodec/Makefile libavcodec/error_resilience.c libavcodec/mpegvideo.c libavcodec/ratecontrol.c libavdevice/avdevice.h libavfilter/Makefile libavfilter/filtfmts.c libavfilter/version.h libavformat/mov.c libavformat/version.h libavutil/Makefile libavutil/avutil.h libavutil/version.h libswscale/swscale.h libswscale/x86/swscale_mmx.c tests/fate/libavutil.mak tests/lavfi-regression.sh tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-04Add XTEA encryption support in libavutilSamuel Pitoiset
Signed-off-by: Martin Storsjö <martin@martin.st>