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-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-17configure: Factor out vp8dsp moduleVittorio Giovara
2015-06-16doc: avoid incorrect phrase 'allows to'Andreas Cadhalpun
Also fix typo found by Lou Logan: Sacrifying -> Sacrificing Reviewed-by: Lou Logan <lou@lrcd.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-06-01avcodec/ppc/pixblockdsp: Fix type of get_pixels_vsx()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-01Merge commit 'd0bf20a4f25ac5de021c860a0c8ad05638ee2078'Michael Niedermayer
* commit 'd0bf20a4f25ac5de021c860a0c8ad05638ee2078': ppc: vsx: Implement diff_pixels and get_pixels Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-31Merge commit '7014b65995b1fe6188fb53447bf61b08e3963355'Michael Niedermayer
* commit '7014b65995b1fe6188fb53447bf61b08e3963355': ppc: pixblockdsp: Use the abriged vector types Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-31ppc: vsx: Implement diff_pixels and get_pixelsLuca Barbato
Use a macro to abstract the endianness.
2015-05-31ppc: Restrict some Altivec implementations to Big EndianLuca Barbato
In Little Endian the vec_ld/vec_st operations work as expected only for byte-vectors.
2015-05-31ppc: pixblockdsp: Use the abriged vector typesLuca Barbato
2015-05-14avcodec/ppc/h264dsp: POWER LE support in h264_idct_dc_add_internal() fix ↵Rong Yan
vec_lvsl bug We got defective video when use GCC 4.9.2 instead of GCC 4.9.1 to compile FFMEPG. And further found that GCC 4.8 and 4.9 need patch to fix the lvsl/lvsr bug on POWER LE, and GCC 5.1 contains the correct code since its release. The message on gcc-patches requesting approval for lvsl/lvsr patch is at https://gcc.gnu.org/ml/gcc-patches/2014-10/msg00228.html. The fixed code avoids using lvsl and will not depends on GCC version, also it uses less instructions on POWER LE. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10avcodec/ppc/h264qpel_template: Fix alignment assertMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-27avcodec/ppc/fdctdsp: POWER LE support in ff_fdct_altivec() delete macros ↵Rong Yan
VEC_FMERGEH() VEC_FMERGEL(), they where wrong GCC tool had a bug of PPC intrinsic interpret, which has been fixed in GCC 4.9.1. This bug lead to errors in two of our previous patches. We found this when we update our GCC tools to 4.9.1 and by reading the related info on GCC website. We fix our previous error in two separate commits Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03avcodec/ppc/fdctdsp: POWER LE support in ff_fdct_altivec()Rong Yan
add marcos VEC_FMERGEH() VEC_FMERGEL() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15Revert "ppc: lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED"Michael Niedermayer
This broke build, note, LOCAL_ALIGNED_16() does not work either Found-by: James Almer <jamrial@gmail.com> This reverts commit 98cccdd91c9aab9e031753f6feb81be0c44a9c8e.
2015-03-14ppc: lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNEDChristophe Gisquet
The later may yield incorrect code for on-stack variables. 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-28avcodec/ppc/fdctdsp: fix const warningMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-03avcodec/ppc/idctdsp.c: POWER LE support in idct_add_altivec()Rong Yan
also add GET_TMP2() macro Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-30avcodec/ppc/h264qpel_template: Change if DEBUG assert() to av_assert2()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-30ppc/mpegvideo_altivec: Change assert to av_assert2()Michael Niedermayer
And move it to where the variable is used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-21libavcodec/ppc/mpegvideoencdsp.c: fix stack smashing in pix_norm1_altivec() ↵Andreas Cadhalpun
and pix_sum_altivec() The vec_ste calls were mistakenly changed to vec_vsx_st in c5ca76a, which caused stack smashing. Changing them back fixes crashes on ppc64el, when configured with --toolchain=hardened. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-08avcodec/ppc/vp3dsp_altivec: POWER LE support to vp3_idct_add_altivec()Rong Yan
add GET_VDST16() macro Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04avcodec/ppc/vp8dsp_altivec.c: POWER LE support put_vp8_epel_h_altivec_core() ↵Rong Yan
put_vp8_epel_v_altivec_core() put_vp8_pixels16_altivec() add marcos GET_PIXHL() GET_OUTER() LOAD_HL() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-04avcodec/ppc/vc1dsp_altivec: add POWER LE support to vc1_inv_trans_8x4_altivec()Rong Yan
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02avcodec/ppc/lossless_audiodsp_altivec: POWER LE support for ↵Rong Yan
scalarproduct_and_madd_int16_altivec() adds macro GET_T() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-28avcodec/ppc/h264qpel_template: protect unistd.h by #if HAVE_UNISTD_HMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-28avcodec/ppc/h264qpel: POWER LE support for put_pixels16_l2_altivec() and ↵Rong Yan
avg_pixels16_l2_altivec() add put_unligned_store() and avg_unligned_store() macros Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-28avcodec/ppc/h264qpel_template: POWER LE support for ↵Rong Yan
PREFIX_h264_qpel16_h_lowpass_altivec() PREFIX_h264_qpel16_v_lowpass_altivec() PREFIX_h264_qpel16_hv_lowpass_altivec() add load_alignment() macro Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-28avcodec/ppc/h264chroma_template: POWER LE support for ↵Rong Yan
PREFIX_h264_chroma_mc8_altivec() PREFIX_no_rnd_vc1_chroma_mc8_altivec() CHROMA_MC8_ALTIVEC_CORE_SIMPLE() CHROMA_MC8_ALTIVEC_CORE() add marcos GET_VSRC1() GET_VSRC() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-28avcodec/ppc/h264dsp: POWER LE support for h264_idct8_add_altivec() ↵Rong Yan
h264_idct_dc_add_internal() h264_loop_filter_luma_altivec() write16x4() VEC_1D_DCT() weight_h264_W_altivec() biweight_h264_W_altivec() VEC_LOAD_U8_ADD_S16_STORE_U8() ALTIVEC_STORE_SUM_CLIP() add marcos GET_2PERM() dstv_load() vdst_load() dest_unligned_store() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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-11libavcodec/ppc/me_cmp.c : support little endian in sse8_altivec(), ↵Rong Yan
hadamard8_diff8x8_altivec() and hadamard8_diff16x8_altivec() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11libavcodec/ppc/me_cmp.c : factorize little and big endian codeRong Yan
add marcos GET_PERM() LOAD_PIX() for POWER LE Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-07libavcodec/ppc/hpeldsp_altivec.c : fix ff_put_pixels16_altivec() ↵Rong Yan
put_no_rnd_pixels16_xy2_altivec() put_no_rnd_pixels8_xy2_altivec() avg_pixels8_altivec() avg_pixels8_xy2_altivec() put_pixels16_xy2_altivec() put_pixels8_xy2_altivec() ff_avg_pixels16_altivec() for POWER LE Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-10libavcodec/ppc/hpeldsp_altivec.c : fix ff_put_pixels16_altivec() for POWER LERong Yan
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-10libavcodec/ppc/me_cmp.c : fix sad16_altivec() sse16_altivec() ↵Rong Yan
sad16_xy2_altivec() sad16_x2_altivec() sad16_y2_altivec() sad8_altivec() for POWER LE Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-10libavcodec/ppc/mpegvideoencdsp.c : fix pix_norm1_altivec() and ↵Rong Yan
pix_sum_altivec() for POWER LE Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-10libavcodec/ppc/pixblockdsp.c : fix get_pixels_altivec() and ↵Rong Yan
diff_pixels_altivec() for POWER LE Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-29Add missing "const" all over the place.Reimar Döffinger
Only "./configure --enable-gpl" on x86 was tested. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
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-06avcodec: Change get_pixels() to ptrdiff_t linesizeMichael Niedermayer
Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02Merge commit 'ffa4d4ef0bd66c4e8bde7357b69bdedc78123ea8'Michael Niedermayer
* commit 'ffa4d4ef0bd66c4e8bde7357b69bdedc78123ea8': ppc: fft: Build AltiVec optimizations in the standard way Conflicts: libavcodec/ppc/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>