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
2014-07-19Merge commit 'b4987f72197e0c62cf2633bf835a9c32d2a445ae'Michael Niedermayer
* commit 'b4987f72197e0c62cf2633bf835a9c32d2a445ae': idct: Convert IDCT permutation #defines to an enum Conflicts: libavcodec/idctdsp.c libavcodec/x86/cavsdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-18idct: Convert IDCT permutation #defines to an enumDiego Biurrun
Also rename the enum values to be consistent with other DCT permutations.
2014-07-01Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'Michael Niedermayer
* commit 'e3fcb14347466095839c2a3c47ebecff02da891e': dsputil: Split off IDCT bits into their own context Conflicts: configure libavcodec/aic.c libavcodec/arm/Makefile libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv6.c libavcodec/asvdec.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dvdec.c libavcodec/dxva2_mpeg2.c libavcodec/intrax8.c libavcodec/mdec.c libavcodec/mjpegdec.c libavcodec/mjpegenc_common.h libavcodec/mpegvideo.c libavcodec/ppc/dsputil_altivec.h libavcodec/ppc/dsputil_ppc.c libavcodec/ppc/idctdsp.c libavcodec/x86/Makefile libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30dsputil: Split off IDCT bits into their own contextDiego Biurrun
2014-02-28Merge commit '92e598a57a7ce4b8ac9ea56274af39f5fd888311'Michael Niedermayer
* commit '92e598a57a7ce4b8ac9ea56274af39f5fd888311': prores: Drop DSP infrastructure for prores encoder bits Conflicts: libavcodec/Makefile libavcodec/proresdsp.c libavcodec/proresenc_kostya.c Note, these changes only affect one of the 2 prores encoders we have If someone wants to add optimizations to the affected encoder, or needs/wants this infrastructure, then iam happy to revert this Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-28Merge commit 'd6acefe05862af244fd5a30ae946ed507c063994'Michael Niedermayer
* commit 'd6acefe05862af244fd5a30ae946ed507c063994': proresenc: Drop unnecessary DCT permutation bits Conflicts: libavcodec/proresenc_kostya.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-28Merge commit 'b23650491fbd579a4365f42bd42575afb7b53f7e'Michael Niedermayer
* commit 'b23650491fbd579a4365f42bd42575afb7b53f7e': prores: Use consistent names for DSP arch initialization functions Conflicts: libavcodec/proresdsp.c libavcodec/proresdsp.h libavcodec/x86/proresdsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-28prores: Drop DSP infrastructure for prores encoder bitsDiego Biurrun
None of the encoder bits are arch-optimized.
2014-02-28proresenc: Drop unnecessary DCT permutation bitsDiego Biurrun
No permutation is necessary for the FDCT.
2014-02-28prores: Use consistent names for DSP arch initialization functionsDiego Biurrun
2014-01-14avcodec/proresdsp: rename CLIP_AND_BIAS to BANANAMichael Niedermayer
See: IRC log Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-14avcodec/proresdsp & idct: move biasing from after the IDCT into the IDCTMichael Niedermayer
This replaces 64 additions by 8 additions MSE Changes from 0.04873672 to 0.05012422 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-30Reinstate proper FFmpeg license for all files.Thilo Borgmann
2013-05-05Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'Michael Niedermayer
* commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487': avcodec: Add av_cold attributes to init functions missing them Conflicts: libavcodec/aacpsy.c libavcodec/atrac3.c libavcodec/dvdsubdec.c libavcodec/ffv1.c libavcodec/ffv1enc.c libavcodec/h261enc.c libavcodec/h264_parser.c libavcodec/h264dsp.c libavcodec/h264pred.c libavcodec/libschroedingerenc.c libavcodec/libxvid_rc.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/proresdsp.c libavcodec/rangecoder.c libavcodec/videodsp.c libavcodec/x86/proresdsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04avcodec: Add av_cold attributes to init functions missing themDiego Biurrun
2013-04-12avcodec: rename prores encodersMichael Niedermayer
Using the first names of authors sounds somewhat unprofessional and might be considered offensive which is not intended. The new names use the initials of the authors due to simplicity and the possibility to apply it consistently without the need to find political correct names for each future case where alternative codecs might exist. Also its shorter ... If someone has a better idea, like maybe 2 random letters and people prefer it then iam happy to switch to that ... Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: dsputil: Move fdct function declarations to dct.h Conflicts: libavcodec/dsputil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09dsputil: Move fdct function declarations to dct.hDiego Biurrun
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-23Drop DCTELEM typedefDiego Biurrun
It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2012-10-08Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: x86: vc1: call ff_vc1dsp_init_x86() under if (ARCH_X86) x86: cavs: call ff_cavsdsp_init_x86() under if (ARCH_X86) x86: call most of the x86 dsp init functions under if (ARCH_X86) doc: support the new website layout doc: remove a warning from filters.texi doc: initial nut documentation segment: drop global headers setting lavu: fix typo in Makefile Conflicts: doc/Makefile doc/filters.texi doc/t2h.init libavcodec/fmtconvert.c libavcodec/proresdsp.c libavcodec/x86/Makefile libavcodec/x86/vc1dsp_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-08x86: call most of the x86 dsp init functions under if (ARCH_X86)Janne Grunau
Rename the called dsp init functions to *_init_x86.
2012-08-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-15Don't include common.h from avutil.hMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-06-04Fix compilation condition for some ProRes dsp encoder functions.Carl Eugen Hoyos
Found, analysed and tested by trac user Jamal. Fixes part of Ticket #1404.
2012-06-04Fix compilation condition for some ProRes dsp decoder functions.Carl Eugen Hoyos
Found, analysed and tested by trac user Jamal. Fixes part of Ticket #1404.
2012-02-17prores: initialise encoder and decoder parts only when neededKostya Shishkov
2012-02-17prores: initialise encoder and decoder parts only when neededKostya Shishkov
2012-02-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (27 commits) ppc: Add ff_ prefix to nonstatic symbols sh4: Add ff_ prefix to nonstatic symbols mpegvideo: Add ff_ prefix to nonstatic functions rtjpeg: Add ff_ prefix to nonstatic symbols rv: Add ff_ prefix to nonstatic symbols vp56: Add ff_ prefix to nonstatic symbols vorbis: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefix to nonstatic symbols vc1: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefixes to nonstatic symbols snow: Add ff_ prefix to nonstatic symbols mpeg12: Add ff_ prefix to nonstatic symbols mpeg4: Add ff_ prefixes to nonstatic symbols lagarith: Add ff_ prefix to lag_rac_init libavcodec: Add ff_ prefix to j_rev_dct* dsputil: Add ff_ prefix to inv_zigzag_direct16 libavcodec: Prefix fdct_ifast, fdct_ifast248 dsputil: Add ff_ prefix to the dsputil*_init* functions libavcodec: Add ff_ prefix to some nonstatic symbols vlc/rl: Add ff_ prefix to the nonstatic symbols ... Conflicts: libavcodec/Makefile libavcodec/allcodecs.c libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h263.h libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/nuv.c libavcodec/ppc/dsputil_ppc.c libavcodec/proresdsp.c libavcodec/svq3.c libavcodec/version.h libavformat/dv.h libavformat/dvenc.c libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-15prores encoderKostya Shishkov
2011-10-14prores: use C idct for fate as the SSE code is not matching the SSE* code ↵Michael Niedermayer
down at the bits Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-11prores: idct sse2/sse4 optimizations.Ronald S. Bultje
~3.0-3.5x as fast as original C version, 1.6x as fast overall.
2011-10-11prores: extract idct into its own dspcontext and merge with put_pixels.Ronald S. Bultje