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
2015-07-27Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21arm: use a local label instead of the function symbol in ff_prefetch_armJanne Grunau
Avoids a relocation which might end out of range for thumb2. Reported-By: Ludovic Fauvet <etix@videolan.org> Bug-Id: https://bugs.webkit.org/show_bug.cgi?id=137022 CC: libav-stable@libav.org
2015-07-18Merge commit '256ef19844892c6cf8e0386e3287bae970ec6320'Michael Niedermayer
* commit '256ef19844892c6cf8e0386e3287bae970ec6320': h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1 Conflicts: libavcodec/arm/h264pred_init_arm.c See: 565cabf5c80b25d86c2e539afcb3b24024fbce0a Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-18h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1Janne Grunau
2015-07-18Merge commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09'Michael Niedermayer
* commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09': configure: Factor out g722dsp module Conflicts: configure libavcodec/arm/Makefile Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17Merge commit 'd42191c78befc1983f23b1899b2dda513b72f1ed'Michael Niedermayer
* commit 'd42191c78befc1983f23b1899b2dda513b72f1ed': configure: Factor out vp8dsp module Conflicts: configure libavcodec/Makefile libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17Merge commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418'Michael Niedermayer
* commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418': configure: Factor out rv34dsp module Conflicts: libavcodec/Makefile libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17Merge commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0'Michael Niedermayer
* commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0': configure: Factor out flacdsp module Conflicts: configure libavcodec/Makefile libavcodec/arm/Makefile Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17configure: Factor out g722dsp moduleVittorio Giovara
2015-07-17configure: Factor out vp8dsp moduleVittorio Giovara
2015-07-17configure: Factor out rv34dsp moduleVittorio Giovara
2015-07-17configure: Factor out flacdsp moduleVittorio Giovara
2015-05-17lavc/flac: Fix encoding and decoding with high lpc.Carl Eugen Hoyos
Based on an analysis by trac user lvqcl. Fixes ticket #4421, reported by Chase Walker.
2015-03-26avcodec/arm/flacdsp_init_arm: Put CONFIG_FLAC_DECODER first in if()Michael Niedermayer
This is more consistent Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-12hevcdsp: fix compilation for arm and aarch64James Almer
Also add av_cold to ff_hevcdsp_init_arm. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-01Merge commit '71f1ad37d858b810b71a4af1c25771beaa50b27b'Michael Niedermayer
* commit '71f1ad37d858b810b71a4af1c25771beaa50b27b': lavc: do not compile fmtconvert unconditionally Conflicts: configure libavcodec/ppc/Makefile libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-01Merge commit 'd74a8cb7e42f703be5796eeb485f06af710ae8ca'Michael Niedermayer
* commit 'd74a8cb7e42f703be5796eeb485f06af710ae8ca': fmtconvert: drop unused functions Conflicts: libavcodec/arm/fmtconvert_vfp_armv6.S libavcodec/x86/fmtconvert.asm libavcodec/x86/fmtconvert_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28lavc: do not compile fmtconvert unconditionallyAnton Khirnov
Only ac3dec and dcadec use it.
2015-02-28fmtconvert: drop unused functionsAnton Khirnov
2015-02-25avcodec/hevcdsp: ARM NEON optimized qpel functionsSeppo Tomperi
uses comma as macro parameter separator Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-25avcodec/arm/hevcdsp_idct_neon: drop ".code 32"Michael Niedermayer
gas-preprocessor and armasm fail otherwise Tested-by: Timotius Margo Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16hevcdsp: HEVC deblocking ARM NEON register clobber fixSeppo Tomperi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16Merge commit '702458538d4e52809bcef460d39baabf061b16b5'Michael Niedermayer
* commit '702458538d4e52809bcef460d39baabf061b16b5': g722: Add ARM NEON implementation for g722_apply_qmf() Conflicts: libavcodec/arm/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15g722: Add ARM NEON implementation for g722_apply_qmf()Peter Meerwald
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-12avcodec/arm/videodsp_armv5te: Fix linking failure with "g++ -shared ↵Michael Niedermayer
-D__STDC_CONSTANT_MACROS -o test.so ... libavcodec.a" Tested-by: Andreas Haupt Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-09hevcdsp: ARM NEON optimized transformsSeppo Tomperi
cherry picked from commit b153f55935969c794de4640f8d34e01c58e027ae Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-06hevcdsp: ARM NEON optimized deblocking filterSeppo Tomperi
cherry picked from commit 1b9ee47d2f43b0a029a9468233626102eb1473b8 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-31lavc/arm: Use the neon vertical chroma loop filter also for H.264 4:2:2.Carl Eugen Hoyos
2014-12-10Merge commit '4c81613df499ba81d64ea102b38d0c6686cc304c'Michael Niedermayer
* commit '4c81613df499ba81d64ea102b38d0c6686cc304c': arm: mlpdsp: handle pic offset calculation in a macro Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-10Merge commit '581c7f0e12b1fa39f73d683e54d6ecda0772c5a9'Michael Niedermayer
* commit '581c7f0e12b1fa39f73d683e54d6ecda0772c5a9': arm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position independent Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-10arm: mlpdsp: handle pic offset calculation in a macroJanne Grunau
Makes the code easier to read since it hides different offset calculations for arm and thumb mode.
2014-12-10arm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position ↵Janne Grunau
independent No significant difference in used cpu cycles on a cortex-a9.
2014-12-09Merge commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46'Michael Niedermayer
* commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46': arm: Use .data.rel.ro for const data with relocations Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-09arm: Use .data.rel.ro for const data with relocationsMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-12-08Merge commit 'b280c6202b28b371a8d96850194fd69d7ad5dcc0'Michael Niedermayer
* commit 'b280c6202b28b371a8d96850194fd69d7ad5dcc0': arm: fft_vfp: Unify the behaviour in ff_fft_calc_vfp between arm/thumb Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-08Merge commit 'ae81576414f2d2083d3118fb4abe1ebc5a7a4c54'Michael Niedermayer
* commit 'ae81576414f2d2083d3118fb4abe1ebc5a7a4c54': arm: fft_vfp: Add a missing "endconst" when building in thumb mode Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-08arm: fft_vfp: Unify the behaviour in ff_fft_calc_vfp between arm/thumbMartin Storsjö
Don't include the function pointer table in the code segment in arm mode. This shouldn't have any significant performance effect. It does end up as a few more instructions than before, for ARM, but only at the entry to this function, not within the fft functions themselves. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-12-08arm: fft_vfp: Add a missing "endconst" when building in thumb modeMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-11-24Merge commit '9c12c6ff9539e926df0b2a2299e915ae71872600'Michael Niedermayer
* commit '9c12c6ff9539e926df0b2a2299e915ae71872600': motion_est: convert stride to ptrdiff_t Conflicts: libavcodec/me_cmp.c libavcodec/ppc/me_cmp.c libavcodec/x86/me_cmp_init.c See: 9c669672c7fd45ef1cad782ab551be438ceac6cd Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-24motion_est: convert stride to ptrdiff_tVittorio Giovara
CC: libav-stable@libav.org Bug-Id: CID 700556 / CID 700557 / CID 700558
2014-11-13x86/flacdsp: add SSE2 and AVX decorrelate functionsJames Almer
Two to four times faster depending on instruction set, block size and channel count.
2014-09-25avcodec/idctdsp: change {put,add}_pixels_clamped to ptrdiff_t line_sizeJames Almer
Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
2014-09-23Fix compile error on arm4/arm5 platformBernd Kuhls
Since these commits http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8 compilation on arm4/arm5 fails: libavcodec/libavcodec.so: undefined reference to `ff_startcode_find_candidate_armv6' Because libavcodec/arm/Makefile contains ARMV6-OBJS-$(CONFIG_STARTCODE) += arm/startcode_armv6.o function ff_startcode_find_candidate_armv6 is not included for older ARM archs. The bug was found during automatic buildroot builds: http://autobuild.buildroot.net/results/ec7/ec71e4f16ee9106747dff5f15999cbd17903e76f//build-end.log Quote from configure summary: ARCH arm (armv4t) big-endian no runtime cpu detection yes ARMv5TE enabled no ARMv6 enabled no ARMv6T2 enabled no http://autobuild.buildroot.net/results/be7/be72eb182eaccf0064a32c9dfc2ac1c0d6555506/build-end.log ARCH arm (armv5te) big-endian no runtime cpu detection yes ARMv5TE enabled yes ARMv6 enabled no ARMv6T2 enabled no This patch provides the necessary #if clauses as discussed with Michael: https://ffmpeg.org/pipermail/ffmpeg-devel/2014-September/163329.html Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03Merge commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b'Michael Niedermayer
* commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b': idctdsp: Add global function pointers for {add|put}_pixels_clamped functions Conflicts: libavcodec/arm/idctdsp_init_arm.c libavcodec/dct.h libavcodec/idctdsp.c libavcodec/jrevdct.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03idctdsp: Add global function pointers for {add|put}_pixels_clamped functionsDiego Biurrun
These function pointers already existed in the ARM code. Adding them globally allows calls to the function pointers to access arch-optimized versions of the functions transparently.
2014-08-15Merge commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6'Michael Niedermayer
* commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6': build: Add explanatory comments to (optimization) blocks in the Makefiles Conflicts: libavcodec/ppc/Makefile libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15Merge commit '835f798c7d20bca89eb4f3593846251ad0d84e4b'Michael Niedermayer
* commit '835f798c7d20bca89eb4f3593846251ad0d84e4b': mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes Conflicts: libavcodec/h261dec.c libavcodec/intrax8.c libavcodec/mjpegenc.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/x86/mpegvideoenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15build: Add explanatory comments to (optimization) blocks in the MakefilesDiego Biurrun
2014-08-15mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixesDiego Biurrun
2014-08-13avcodec/idctdsp: make add/put_pixels_clamped_c internal functionsJames Almer
This reduces code duplication and differences with the fork. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>