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
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.
2012-09-25arm/h264: fix overreads in h264_chroma_mc8-and-h264_chroma_mc4bruce-wu
Fixes Ticket1227
2012-09-21Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: libx264: add forgotten ; matroskadec: fix a sanity check. matroskadec: only return corrupt packets that actually contain data lavf: zero data/size of the packet passed to read_packet(). ARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code ARM: align PIC offset pools to 4 bytes ARM: swap source operands in some add instructions configure: update tms470 detection for latest version lavf probe: prevent codec probe with no data at all seen motion_est: fix use of inline on extern functions Conflicts: libavcodec/motion_est_template.c libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-20ARM: swap source operands in some add instructionsMans Rullgard
This allows using a 16-bit opcode when generating Thumb2 code. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-09-16arm/dca: Fix compilation of decode_blockcodes() with --enable-thumbMichael Niedermayer
Fix Suggested-by: Reimar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mpegvideo: drop unnecessary arguments to hpel_motion() mpegvideo: drop 'inline' from some functions nellymoserdec: drop support for s16 output. bmpdec: only initialize palette for pal8. build: Properly remove object files while cleaning flacdsp: arm optimised lpc filter compat/vsnprintf: return number of bytes required on truncation. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-16flacdsp: arm optimised lpc filterMans Rullgard
2012-09-09dsputil/me/pixels: Actually use av_restrictDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-08Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-07Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov
2012-08-07arm: fix compile with disable-optimizations on androidMichael Niedermayer
Fixes Ticket1241 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-05Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lavr: fix handling of custom mix matrices fate: force pix_fmt in lagarith-rgb32 test fate: add tests for lagarith lossless video codec. ARMv6: vp8: fix stack allocation with Apple's assembler ARM: vp56: allow inline asm to build with clang fft: 3dnow: fix register name typo in DECL_IMDCT macro x86: dct32: port to cpuflags x86: build: replace mmx2 by mmxext Revert "wmapro: prevent division by zero when sample rate is unspecified" wmapro: prevent division by zero when sample rate is unspecified lagarith: fix color plane inversion for YUY2 output. lagarith: pad RGB buffer by 1 byte. dsputil: make add_hfyu_left_prediction_sse4() support unaligned src. Conflicts: doc/APIchanges libavcodec/lagarith.c libavfilter/x86/gradfun.c libavutil/cpu.h libavutil/version.h libswscale/utils.c libswscale/version.h libswscale/x86/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-04ARMv6: vp8: fix stack allocation with Apple's assemblerMans Rullgard
In the GNU assembler, a relational expression, bizarrely, has the value -1 if true, whereas in Apple's it is +1. This patch makes sure the correct expression is used in both cases. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-08-04ARM: vp56: allow inline asm to build with clangMans Rullgard
The clang integrated assembler does not support pre-UAL syntax, while gcc requires pre-UAL syntax for ARM code. A patch[1] for clang to support the old syntax as well has been ignored since January. This patch chooses the syntax appropriate for each compiler, allowing both to build the code. Notably, this change allows building for iphone with the latest Apple Xcode update. [1] http://llvm.org/bugs/show_bug.cgi?id=11855 Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-08-02Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: dca: Switch dca_sample_rates to avpriv_ prefix; it is used across libs ARM: use =const syntax instead of explicit literal pools ARM: use standard syntax for all LDRD/STRD instructions fft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64. dct-test: allow to compile without HAVE_INLINE_ASM. x86/dsputilenc: bury inline asm under HAVE_INLINE_ASM. dca: Move tables used outside of dcadec.c to a separate file. dca: Rename dca.c ---> dcadec.c x86: h264dsp: Remove unused variable ff_pb_3_1 apetag: change a forgotten return to return 0 Conflicts: libavcodec/Makefile libavcodec/dca.c libavcodec/x86/fft_3dn.c libavcodec/x86/fft_3dn2.c libavcodec/x86/fft_mmx.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-01ARM: use =const syntax instead of explicit literal poolsMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-08-01ARM: use standard syntax for all LDRD/STRD instructionsMans Rullgard
The standard syntax requires two destination registers for LDRD/STRD instructions. Some versions of the GNU assembler allow using only one with the second implicit, others are more strict. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-07-19Fix misspellings of FFmpegMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-19Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: ppc: fix build with altivec disabled vp3: move idct and loop filter pointers to new vp3dsp context build: add CONFIG_VP3DSP, reduce repetition in OBJS lists tscc2: do not add/subtract 128 bias during DCT tscc2: fix typo in DCT configure: clarify external library section of help output configure: mark libfdk-aac as nonfree configure: cosmetics: drop some unnecessary backslashes os_support: K&R formatting cosmetics Conflicts: configure libavcodec/vp3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-18vp3: move idct and loop filter pointers to new vp3dsp contextMans Rullgard
This moves all VP3-specific function pointers from dsputil to a new vp3dsp context. There is no reason to ever use the VP3 IDCT where an MPEG2 IDCT is expected or vice versa. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-07-18build: add CONFIG_VP3DSP, reduce repetition in OBJS listsMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-07-02Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: opt/eval: Include mathematics.h for NAN/INFINITY mathematics: Don't use division by zero in NAN/INFINITY macros wma: Lower the maximum number of channels to 2 x86: cpu: clean up check for cpuid instruction support ARM: generate position independent code to access data symbols Conflicts: libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>