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
2016-06-21Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
2016-05-04cosmetics: Fix spelling mistakesVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-24Correct few "ffmpeg" typosPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-06-02Merge commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73'Michael Niedermayer
* commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73': Remove all Blackfin architecture optimizations Conflicts: libavcodec/bfin/dsputil.S libavcodec/bfin/dsputil_init.c libavcodec/bfin/fdct_bfin.S libavcodec/bfin/hpel_pixels_no_rnd.S libavcodec/bfin/hpeldsp_init.c libavcodec/bfin/idct_bfin.S libavcodec/bfin/mathops.h libavcodec/bfin/pixels.S libavcodec/bfin/pixels.h libavcodec/bfin/vp3dsp.S libavcodec/bfin/vp3dsp_init.c libavutil/bfin/asm.h libavutil/bfin/attributes.h libswscale/bfin/internal_bfin.S libswscale/bfin/swscale_bfin.c libswscale/bfin/yuv2rgb_bfin.c libswscale/swscale_internal.h libswscale/version.h If someone wants to maintain blackfin support in FFmpeg, please contact ffmpeg-devel@ffmpeg.org Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02Remove all Blackfin architecture optimizationsDiego Biurrun
Blackfin is a painful platform to work with, no test machines are available and the range of multimedia applications is dubious. Thus it only represents a maintenance burden.
2014-04-05Merge commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d'Michael Niedermayer
* commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d': Remove a number of unnecessary dsputil.h #includes Conflicts: libavcodec/h264pred.c libavcodec/vc1dsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04Remove a number of unnecessary dsputil.h #includesDiego Biurrun
2014-04-02Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: VP3: K&R formatting cosmetics Conflicts: libavcodec/vp3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02VP3: K&R formatting cosmeticsVittorio Giovara
2014-03-14Merge commit 'ed9625eb62be1e1c44cecdd73ea0d80077a15d48'Michael Niedermayer
* commit 'ed9625eb62be1e1c44cecdd73ea0d80077a15d48': dsputil: Move intreadwrite.h #include from header file to .c files Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13dsputil: Move intreadwrite.h #include from header file to .c filesDiego Biurrun
2013-04-16Merge commit '015821229f96bf7e677f2a711a58dbea3009f574'Michael Niedermayer
* commit '015821229f96bf7e677f2a711a58dbea3009f574': vp3: Use full transpose for all IDCTs Conflicts: libavcodec/vp3.c libavcodec/vp3dsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15vp3: Use full transpose for all IDCTsRonald S. Bultje
This way, the special IDCT permutations are no longer needed. This is similar to how H264 does it, and removes the dsputil dependency imposed by the scantable code. Also remove the unused type == 0 cases from the plain C version of the idct. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-13vp3/x86: use full transpose for all IDCTs.Ronald S. Bultje
This way, the special IDCT permutations are no longer needed. Bfin code is disabled until someone updates it. This is similar to how H264 does it, and removes the dsputil dependency imposed by the scantable code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09Merge commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf'Michael Niedermayer
* commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf': dsputil: Move rnd_avg inline functions to a separate header Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09dsputil: Move rnd_avg inline functions to a separate headerDiego Biurrun
2013-01-29Merge commit '098eed95bc1a6b2c8ac97f126f62bb74699670cf'Michael Niedermayer
* commit '098eed95bc1a6b2c8ac97f126f62bb74699670cf': mdec: merge mdec_common_init() into decode_init(). eatgv: use fixed-width types where appropriate. x86: Simplify some arch conditionals bfin: Separate VP3 initialization code Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-29bfin: Separate VP3 initialization codeDiego 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-23Merge commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a'Michael Niedermayer
* commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a': vp3dsp: don't do aligned reads on input. mlp_parser: cosmetics: re-indent. 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-23vp3dsp: don't do aligned reads on input.Ronald S. Bultje
The input is not guaranteed to be aligned.
2013-01-22Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: proresdec: support mixed interlaced/non-interlaced content vp3/5: move put_no_rnd_pixels_l2 from dsputil to VP3DSPContext. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-22vp3/5: move put_no_rnd_pixels_l2 from dsputil to VP3DSPContext.Ronald S. Bultje
The function is only used in VP3 and VP5, so no need to have it in DSPContext.
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-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>
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-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-03-07Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: SBR DSP: fix SSE code to not use SSE2 instructions. cpu: initialize mask to -1, so that by default, optimizations are used. error_resilience: initialize s->block_index[]. svq3: protect against negative quantizers. Don't use ff_cropTbl[] for IDCT. swscale: make filterPos 32bit. FATE: add CPUFLAGS variable, mapping to -cpuflags avconv option. avconv: add -cpuflags option for setting supported cpuflags. cpu: add av_set_cpu_flags_mask(). libx264: Allow overriding the sliced threads option avconv: fix counting encoded video size. Conflicts: doc/APIchanges doc/fate.texi doc/ffmpeg.texi ffmpeg.c libavcodec/h264idct_template.c libavcodec/svq3.c libavutil/avutil.h libavutil/cpu.c libavutil/cpu.h libswscale/swscale.c tests/Makefile tests/fate-run.sh tests/regression-funcs.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-06Don't use ff_cropTbl[] for IDCT.Ronald S. Bultje
Results of IDCT can by far outreach the range of ff_cropTbl[], leading to overreads and potentially crashes. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2010-06-23Improve some uses of ff_cropTbl with constant offsetMåns Rullgård
Originally committed as revision 23728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-28vp3: 10l Fix DC-only IDCT for C and ARM tooDavid Conrad
Originally committed as revision 23359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20Remove explicit filename from Doxygen @file commands.Diego Biurrun
Passing an explicit filename to this command is only necessary if the documentation in the @file block refers to a file different from the one the block resides in. Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-17vp3: DC-only IDCTDavid Conrad
2-4% faster overall decode Originally committed as revision 22896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01Use full internal pathname in doxygen @file directives.Diego Biurrun
Otherwise doxygen complains about ambiguous filenames when files exist under the same name in different subdirectories. Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04Move VP3 loop filter to DSPContextDavid Conrad
Originally committed as revision 15551 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-14Fix decoding of 320x240.ogg.Michael Niedermayer
Originally committed as revision 14227 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10Remove redundant #inclusion of common.h, avcodec.h already #includes it.Diego Biurrun
Originally committed as revision 8967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-08rename always_inline to av_always_inline and move to common.hMåns Rullgård
Originally committed as revision 7256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-12rename cropTbl -> ff_cropTblMåns Rullgård
Originally committed as revision 6992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07Change license headers to say 'FFmpeg' instead of 'this program/this library'Diego Biurrun
and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-20avoid 4 +Michael Niedermayer
Originally committed as revision 5799 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-20remove 166 useless underscores, and make this file valid c code as a resultMichael Niedermayer
Originally committed as revision 5798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-20remove a few useless casts and avoid the useless t1/t2 variablesMichael Niedermayer
Originally committed as revision 5797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-13Update licensing information: The FSF changed postal address.Diego Biurrun
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17COSMETICS: Remove all trailing whitespace.Diego Biurrun
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-07Kill some compiler warnings. Compiled code verified identical after changes.Måns Rullgård
Originally committed as revision 4567 to svn://svn.ffmpeg.org/ffmpeg/trunk