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
2013-01-23Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer
* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f': Drop DCTELEM typedef Conflicts: libavcodec/alpha/dsputil_alpha.h libavcodec/alpha/motion_est_alpha.c libavcodec/arm/dsputil_init_armv6.c libavcodec/bfin/dsputil_bfin.h libavcodec/bfin/pixels_bfin.S libavcodec/cavs.c libavcodec/cavsdec.c libavcodec/dct-test.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/eamad.c libavcodec/h264_cavlc.c libavcodec/h264idct_template.c libavcodec/mpeg12.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/ppc/dsputil_altivec.c libavcodec/proresdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'Michael Niedermayer
* commit '73b704ac609d83e0be124589f24efd9b94947cf9': arm: Add some missing header #includes floatdsp: move scalarproduct_float from dsputil to avfloatdsp. Conflicts: libavcodec/acelp_pitch_delay.c libavcodec/amrnbdec.c libavcodec/amrwbdec.c libavcodec/ra288.c libavcodec/x86/dsputil_mmx.c libavutil/x86/float_dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3'Michael Niedermayer
* commit '5959bfaca396ecaf63a8123055f499688b79cae3': floatdsp: move butterflies_float from dsputil to avfloatdsp. Conflicts: libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/imc.c libavcodec/mpegaudiodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'Michael Niedermayer
* commit '42d324694883cdf1fff1612ac70fa403692a1ad4': floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp. Conflicts: libavcodec/arm/dsputil_init_vfp.c libavcodec/arm/dsputil_vfp.S libavcodec/dsputil.c libavcodec/ppc/float_altivec.c libavcodec/x86/dsputil.asm libavutil/x86/float_dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23Merge commit '55aa03b9f8f11ebb7535424cc0e5635558590f49'Michael Niedermayer
* commit '55aa03b9f8f11ebb7535424cc0e5635558590f49': floatdsp: move vector_fmul_add from dsputil to avfloatdsp. Conflicts: libavcodec/dsputil.c libavcodec/x86/dsputil.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23Drop DCTELEM typedefDiego Biurrun
It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2013-01-23arm: Add some missing header #includesDiego Biurrun
2013-01-22floatdsp: move butterflies_float from dsputil to avfloatdsp.Ronald S. Bultje
This makes wmadec/enc, twinvq and mpegaudiodec (i.e. mp2/mp3) independent of dsputil.
2013-01-22floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.Ronald S. Bultje
Now, nellymoserenc and aacenc no longer depends on dsputil. Independent of this patch, wmaprodec also does not depend on dsputil, so I removed it from there also.
2013-01-22floatdsp: move vector_fmul_add from dsputil to avfloatdsp.Ronald S. Bultje
2013-01-22floatdsp: move scalarproduct_float from dsputil to avfloatdsp.Ronald S. Bultje
This makes the aac decoder and all voice codecs independent of dsputil.
2013-01-21Merge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3'Michael Niedermayer
* commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3': fate: Use wmv2 IDCT for wmv2 tests vorbisdsp: change block_size type from int to intptr_t. Conflicts: tests/fate-run.sh tests/fate/vcodec.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-21Merge commit '68f18f03519ae550e25cf12661172641e9f0eaca'Michael Niedermayer
* commit '68f18f03519ae550e25cf12661172641e9f0eaca': videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL dsputil: drop non-compliant "fast" qpel mc functions get_bits: change the failure condition in init_get_bits Conflicts: libavcodec/get_bits.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-21vorbisdsp: change block_size type from int to intptr_t.Ronald S. Bultje
This saves one instruction in the x86-64 assembly.
2013-01-20videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNALJanne Grunau
libavutil/arm/asm.S sets '.arch' depending on HAVE_ARMV5TE so that assembling armv5te code will always succeed even if the default -march flag does not support it. HAVE_ARMV5TE_EXTERNAL tests assembling code with the default arch. Fixes the missing symbol ff_prefetch_arm with --cpu= not including armv5te. CC: libav-stable@libav.org
2013-01-20Merge commit 'fef906c77c09940a2fdad155b2adc05080e17eda'Michael Niedermayer
* commit 'fef906c77c09940a2fdad155b2adc05080e17eda': Move vorbis_inverse_coupling from dsputil to vorbisdspcontext. Conflicts: libavcodec/dsputil.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-20Merge commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a'Michael Niedermayer
* commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a': vp3: integrate clear_blocks with idct of previous block. mpegvideo: fix loop condition in draw_line() dvdsubdec: parse the size from the extradata Conflicts: libavcodec/dvdsubdec.c libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-20Move vorbis_inverse_coupling from dsputil to vorbisdspcontext.Ronald S. Bultje
Conveniently (together with Justin's earlier patches), this makes our vorbis decoder entirely independent of dsputil.
2013-01-20vp3: integrate clear_blocks with idct of previous block.Ronald S. Bultje
This is identical to what e.g. vp8 does, and prevents the function call overhead (plus dependency on dsputil for this particular function). Arm asm updated by Janne Grunau <janne-libav@jannau.net>. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2013-01-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lavc: Move vector_fmul_window to AVFloatDSPContext rtpdec_mpeg4: Check the remaining amount of data before reading Conflicts: libavcodec/dsputil.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-16lavc: Move vector_fmul_window to AVFloatDSPContextJustin Ruggles
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-12-22videodsp: Fix project nameMichael Niedermayer
These are all part of splited out dsp utils from FFmpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'Michael Niedermayer
* commit '6906b19346ae8a330bfaa1c16ce535be10789723': lavc: add missing files for arm lavc: introduce VideoDSPContext Conflicts: configure libavcodec/arm/dsputil_init_armv5te.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/h264.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20lavc: add missing files for armLuca Barbato
Across the many retouches those did not make the main commit.
2012-12-20lavc: introduce VideoDSPContextRonald S. Bultje
Move some functions from dsputil. The idea is that videodsp contains functions that are useful for a large and varied set of video decoders. Currently, it contains emulated_edge_mc() and prefetch(). Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-12-19Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'Michael Niedermayer
* commit '523c7bd23c781aa0f3a85044896f5e18e8b52534': misc typo, style and wording fixes Conflicts: libavcodec/options_table.h libavutil/pixfmt.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18misc typo, style and wording fixesDiego Biurrun
2012-12-09arm: put prefetch under matching #ifdef as the actual codeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-08Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'Michael Niedermayer
* commit 'b326755989b346d0d935e0628e8865f9b2951c30': arm: rename ARMVFP config symbol to VFP Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-08Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'Michael Niedermayer
* commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5': configure: arm: make _inline arch ext symbols depend on inline_asm arm: use HAVE*_INLINE/EXTERNAL macros for conditional compilation Conflicts: configure libavcodec/arm/dca.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-08Merge commit '9ebd45c2d58ad9241ad09718679f0cf7fb57da52'Michael Niedermayer
* commit '9ebd45c2d58ad9241ad09718679f0cf7fb57da52': configure: do not bypass cpuflags section if --cpu not given dct-test: arm: indicate required cpu features for optimised funcs snow: fix build after 594d4d5df3c70404168701dd5c90b7e6e5587793 arm: fix use of uninitialised value in ff_fft_fixed_init_arm() avpicture: Don't assume a valid pix fmt in avpicture_get_size Conflicts: libavcodec/avpicture.c libavcodec/snow.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-07arm: rename ARMVFP config symbol to VFPMans Rullgard
This is consistent with usual ARM nomenclature as well as with the VFPV3 and NEON symbols which both lack the ARM prefix. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-12-07arm: use HAVE*_INLINE/EXTERNAL macros for conditional compilationMans Rullgard
These macros reflect the actual capabilities required here. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-12-07arm: fix use of uninitialised value in ff_fft_fixed_init_arm()Mans Rullgard
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>
2012-11-27Merge commit '284ea790d89441fa1e6b2d72d3c1ed6d61972f0b'Michael Niedermayer
* commit '284ea790d89441fa1e6b2d72d3c1ed6d61972f0b': dsputil: move vector_fmul_scalar() to AVFloatDSPContext in libavutil aacenc: use the correct output buffer aacdec: fix signed overflows in lcg_random() base64: fix signed overflow in shift Conflicts: libavcodec/dsputil.c libavutil/base64.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-26dsputil: move vector_fmul_scalar() to AVFloatDSPContext in libavutilJustin Ruggles
2012-10-30Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: pixfmt: support more yuva formats swscale: support gray to 9bit and 10bit formats configure: rewrite print_config() function using awk FATE: fix (AD)PCM test dependencies broken in e519990 Use ptrdiff_t instead of int for intra pred "stride" function parameter. x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes. Conflicts: libavcodec/h264pred.c libavcodec/h264pred_template.c libavutil/pixfmt.h libswscale/swscale_unscaled.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>
2012-10-30Use ptrdiff_t instead of int for intra pred "stride" function parameter.Ronald S. Bultje
This way, SIMD-optimized functions don't have to sign-extend their stride argument manually to be able to do pointer arithmetic.
2012-10-20Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'Michael Niedermayer
* commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed': fate-vc1: add dependencies ARM: fix overreads in neon h264 chroma mc rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet gitignore: ignore files created by msvc fate: Add proper dependencies for the tests in video.mak configure: Disable Snow decoder and encoder by default lzo: Drop obsolete fast_memcpy reference build: Drop OBJS declaration for non-existing PCM_DVD encoder mpeg4videodec: Disable frame multithreading for GMC, its not implemented at all Conflicts: libavcodec/mpegvideo.c libavformat/rtsp.c tests/fate/microsoft.mak tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-20ARM: fix overreads in neon h264 chroma mcMans Rullgard
The loops were reading ahead one line, which could end up outside the buffer for reference blocks at the edge of the picture. Removing this readahead has no measurable performance impact. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-12Merge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024'Michael Niedermayer
* commit '9734b8ba56d05e970c353dfd5baafa43fdb08024': Move avutil tables only used in libavcodec to libavcodec. Conflicts: libavcodec/mathtables.c libavutil/intmath.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-11Move avutil tables only used in libavcodec to libavcodec.Diego Biurrun
2012-10-11Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6'Michael Niedermayer
* commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6': avio: introduce avio_closep mpegtsenc: set muxing type notification to verbose vc1dec: Use correct spelling of "opposite" a64multienc: change mc_frame_counter to unsigned arm: call arm-specific rv34dsp init functions under if (ARCH_ARM) svq1: Drop a bunch of useless parentheses parseutils-test: do not print numerical error codes svq1: K&R formatting cosmetics Conflicts: doc/APIchanges libavcodec/svq1dec.c libavcodec/svq1enc.c libavformat/version.h libavutil/parseutils.c tests/ref/fate/parseutils Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-10arm: call arm-specific rv34dsp init functions under if (ARCH_ARM)Jean-Baptiste Kempf
Assign NEON specific function pointers after runtime check via av_get_cpu_flags(). Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2012-10-10Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f'Michael Niedermayer
* commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f': adxdec: use planar sample format adpcmdec: use planar sample format for adpcm_thp adpcmdec: use planar sample format for adpcm_ea_xas adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3 adpcmdec: use planar sample format for adpcm_xa adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3 adpcmdec: use planar sample format for adpcm_4xm adpcmdec: use planar sample format for adpcm_ima_wav adpcmdec: use planar sample format for adpcm_ima_qt pcmdec: use planar sample format for pcm_lxf mace: use planar sample format atrac1: use planar sample format build: non-x86: Only compile mpegvideo optimizations when necessary rtpdec_mpeg4: au_headers is a single array, simple av_free is enough avcodec: free extended_data instead address of it fate: Add tests of the ff_make_absolute_url function url: Handle relative urls starting with two slashes url: Handle relative urls being just a new query string url: Don't treat slashes in query parameters as directory separators Conflicts: libavcodec/adxdec.c libavcodec/mips/Makefile libavcodec/pcm.c libavcodec/utils.c libavformat/Makefile libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-09build: non-x86: Only compile mpegvideo optimizations when necessaryDiego Biurrun
2012-10-06mpegvideo_armv5te: change asserts to av_assertsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-03Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: ARM: use numeric ID for Tag_ABI_align_preserved segment: Pass the interrupt callback on to the chained AVFormatContext, too ARM: bswap: drop armcc version of av_bswap16() ARM: set Tag_ABI_align_preserved in all asm files Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-02ARM: set Tag_ABI_align_preserved in all asm filesMans Rullgard
All our ARM asm preserves alignment so setting this attribute in a common location is simpler. This removes numerous warnings when linking with armcc. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-09-26Revert "arm/h264: fix overreads in h264_chroma_mc8-and-h264_chroma_mc4"Michael Niedermayer
This reverts commit d25f87f5174df5923be7ce0bb89fad08999286ed. This breaks decoding of some h264 files I have tested the original patch with fate but by mistake have forgotten to specify the fate samples so testing was limited to the internal regression tests.