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
2011-05-30Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: ARM: enable UAL syntax in asm.S v4l2: don't leak video standard string on error. swscale: Remove disabled code. avfilter: Surround function only used in debug mode by appropriate #ifdef. vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog(). build: remove BUILD_ROOT variable vp8: use av_clip_uintp2() where possible Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-29Add const to vector types for input in altivec code.Reimar Döffinger
Avoids a large amount of warnings about cast discarding qualifiers.
2011-05-29Remove unused variable, avoiding compiler warning.Reimar Döffinger
2011-05-29Cast pointers to uintptr_t rather than unsigned int.Reimar Döffinger
Avoids potential warnings on PPC64 systems.
2011-05-29swscale: Remove disabled code.Diego Biurrun
2011-05-29Merge remote-tracking branch 'qatar/master' into masterMichael Niedermayer
* qatar/master: (27 commits) ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits() ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits. ac3dsp: fix loop condition in ac3_update_bap_counts_c() ARM: unbreak build ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4. ac3enc: split mantissa bit counting into a separate function. ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct. get_bits: add av_unused tag to cache variable sws: replace all long with int. ARM: aacdec: fix constraints on inline asm ARM: remove unnecessary volatile from inline asm ARM: add "cc" clobbers to inline asm where needed ARM: improve FASTDIV asm ac3enc: use LOCAL_ALIGNED macro APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7). lavu: add av_get_pix_fmt_name() convenience function cmdutils: remove OPT_FUNC2 swscale: fix crash in bilinear scaling. vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping webm: support stereo videos in matroska/webm muxer ... Conflicts: Changelog cmdutils.c cmdutils.h doc/APIchanges doc/muxers.texi ffmpeg.c ffplay.c libavcodec/ac3enc.c libavcodec/ac3enc_float.c libavcodec/avcodec.h libavcodec/get_bits.h libavcodec/libvpxenc.c libavcodec/version.h libavdevice/libdc1394.c libavformat/matroskaenc.c libavutil/avutil.h libswscale/rgb2rgb.c libswscale/swscale.c libswscale/swscale_template.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-29swscale: Commits that could not be pulled earlier due to bugs #2Michael Niedermayer
commit 5a5a0f161359ca6c3fd03eac88a57bd026b8bc1d Author: Diego Biurrun <diego@biurrun.de> Date: Fri May 27 19:46:39 2011 +0200 swscale: Remove unused variables in x86 code. libswscale/x86/swscale_template.c:2072: warning: unused variable ‘canMMX2BeUsed’ libswscale/x86/swscale_template.c:2145: warning: unused variable ‘canMMX2BeUsed’ libswscale/x86/swscale_template.c:2209: warning: unused variable ‘chrVPixBuf’ libswscale/x86/swscale_template.c:2237: warning: unused variable ‘chrVSrcPtr’ commit 389e2000ebc299b9da24f7e5faf9a68a88f9ee7c Author: Ronald S. Bultje <rsbultje@gmail.com> Date: Fri May 27 12:23:32 2011 -0400 swscale: delay allocation of formatConvBuffer(). That means it won't be allocated when not needed. Alongside this, it fixes valgrind/fate-detected memory leaks. commit f327bfa6dcdbce4593213c30a328d8aaf7a4b86b Author: Ronald S. Bultje <rsbultje@gmail.com> Date: Fri May 27 11:36:43 2011 -0400 swscale: fix build with --disable-swscale-alpha. commit 9f5d45025e8df9d5f39832caad16b94cb6ac11c5 Author: Ronald S. Bultje <rsbultje@gmail.com> Date: Fri May 27 09:28:38 2011 -0400 swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions.
2011-05-29Commits that could not be pulled earlier due to bugs.Michael Niedermayer
commit 93681fbd5082a3af896b7a730dacdd27a3052406 Author: Ronald S. Bultje <rsbultje@gmail.com> Date: Thu May 26 11:32:32 2011 -0400 swscale: fix compile on ppc. commit e758573a887cfb1155e81499ca54f433127cf24e Author: Ronald S. Bultje <rsbultje@gmail.com> Date: Thu May 26 10:36:47 2011 -0400 swscale: fix compile on x86-32. commit 0f4eb8b04341081591bf401eaa2c07d6bc3ff52e Author: Ronald S. Bultje <rsbultje@gmail.com> Date: Thu May 26 09:17:52 2011 -0400 swscale: remove VOF/VOFW. commit b4a224c5e4109cb2cca8bac38628673d685fe763 Author: Ronald S. Bultje <rsbultje@gmail.com> Date: Wed May 25 14:30:09 2011 -0400 swscale: split chroma buffers into separate U/V planes. Preparatory step to implement support for sizes > VOFW.
2011-05-28swscale: use av_clip_uint8() in yuv2yuv1_c().Ronald S. Bultje
2011-05-28swscale: replace formatConvBuffer[VOF] by allocated array.Ronald S. Bultje
This allows to convert between formats of arbitrary width, regardless of the value of VOF/VOFW.
2011-05-28sws: replace all long with int.Anton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-05-28swscale: fix crash in bilinear scaling.Ronald S. Bultje
2011-05-28rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions.Ronald S. Bultje
Many functions have such a prefix, but do not actually use any instructions or features from that set, thus giving the false impression that swscale is highly optimized for a particular system, whereas in reality it is not.
2011-05-28swscale: reindent h[cy]scale_fast() and updateDitherTables().Ronald S. Bultje
2011-05-28swscale: reformat x86/swscale_template.c.Ronald S. Bultje
Interleave macros and code so that it's easier to find the actual code that belongs to a function. Also reindent where appropriate and remove dead code.
2011-05-28swscale: remove duplicate mmx/mmx2 functions if they are identical.Ronald S. Bultje
2011-05-28swscale: remove if (c->dstFormat) branch from yuv2packed[12X]().Ronald S. Bultje
This allows cutting up the function in much smaller and easier- to-maintain chunks.
2011-05-28swscale: remove if(full_chr_int) from yuv2packed1().Ronald S. Bultje
If that flag is set, swScale() already proxies the call to yuv2rgbXinC_full(). Therefore, this flag is never set when yuv2packed1() is called.
2011-05-28swscale: remove if(accurate_rnd) branch from functions.Ronald S. Bultje
2011-05-28swscale: revive SWS_CPU_CAPS until next major bump.Anton Khirnov
2011-05-28swscale: Remove commented-out printf cruft.Diego Biurrun
2011-05-27swscale: Remove unused variables in x86 code.Diego Biurrun
libswscale/x86/swscale_template.c:2072: warning: unused variable ‘canMMX2BeUsed’ libswscale/x86/swscale_template.c:2145: warning: unused variable ‘canMMX2BeUsed’ libswscale/x86/swscale_template.c:2209: warning: unused variable ‘chrVPixBuf’ libswscale/x86/swscale_template.c:2237: warning: unused variable ‘chrVSrcPtr’
2011-05-27swscale: delay allocation of formatConvBuffer().Ronald S. Bultje
That means it won't be allocated when not needed. Alongside this, it fixes valgrind/fate-detected memory leaks.
2011-05-27swscale: fix build with --disable-swscale-alpha.Ronald S. Bultje
2011-05-27swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions.Ronald S. Bultje
2011-05-27swscale: dont loose precission on RGB/BGR48 input, that is dont drop half ↵Michael Niedermayer
the bits. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-27swscale: Do not loose precission on yuv values after rgb->yuv.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-26swscale: fix compile on ppc.Ronald S. Bultje
2011-05-26swscale: fix compile on x86-32.Ronald S. Bultje
2011-05-26swscale: use av_clip_uint8() in yuv2yuv1_c().Ronald S. Bultje
2011-05-26swscale: remove VOF/VOFW.Ronald S. Bultje
2011-05-26swscale: split chroma buffers into separate U/V planes.Ronald S. Bultje
Preparatory step to implement support for sizes > VOFW.
2011-05-26swscale: replace formatConvBuffer[VOF] by allocated array.Ronald S. Bultje
This allows to convert between formats of arbitrary width, regardless of the value of VOF/VOFW.
2011-05-26rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions.Ronald S. Bultje
Many functions have such a prefix, but do not actually use any instructions or features from that set, thus giving the false impression that swscale is highly optimized for a particular system, whereas in reality it is not.
2011-05-26swscale: reindent h[cy]scale_fast() and updateDitherTables().Ronald S. Bultje
2011-05-26swscale: reformat x86/swscale_template.c.Ronald S. Bultje
Interleave macros and code so that it's easier to find the actual code that belongs to a function. Also reindent where appropriate and remove dead code.
2011-05-26swscale: remove duplicate mmx/mmx2 functions if they are identical.Ronald S. Bultje
2011-05-26swscale: remove if (c->dstFormat) branch from yuv2packed[12X]().Ronald S. Bultje
This allows cutting up the function in much smaller and easier- to-maintain chunks.
2011-05-26swscale: remove if(full_chr_int) from yuv2packed1().Ronald S. Bultje
If that flag is set, swScale() already proxies the call to yuv2rgbXinC_full(). Therefore, this flag is never set when yuv2packed1() is called.
2011-05-26swscale: remove if(accurate_rnd) branch from functions.Ronald S. Bultje
2011-05-26swscale: revive SWS_CPU_CAPS until next major bump.Anton Khirnov
2011-05-26swscale: Remove commented-out printf cruft.Diego Biurrun
2011-05-26Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (32 commits) doc: create separate section for audio encoders swscale: Remove orphaned, commented-out function declaration. swscale: Eliminate rgb24toyv12_c() duplication. Remove h263_msmpeg4 from MpegEncContext. APIchanges: Fill in git hash for fps_probe_size (30315a8) avformat: Add fpsprobesize as an AVOption. avoptions: Return explicitly NAN or {0,0} if the option isn't found rtmp: Reindent rtmp: Don't try to do av_malloc(0) tty: replace AVFormatParameters.sample_rate abuse with a private option. Fix end time of last chapter in compute_chapters_end ffmpeg: get rid of useless AVInputStream.nb_streams. ffmpeg: simplify managing input files and streams ffmpeg: purge redundant AVInputStream.index. lavf: deprecate AVFormatParameters.channel. libdc1394: add a private option for channel. dv1394: add a private option for channel. v4l2: reindent. v4l2: add a private option for channel. lavf: deprecate AVFormatParameters.standard. ... Conflicts: doc/APIchanges doc/encoders.texi ffmpeg.c libavdevice/alsa-audio.h libavformat/version.h libavutil/opt.c libswscale/rgb2rgb.h libswscale/rgb2rgb_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-26swscale: Remove orphaned, commented-out function declaration.Diego Biurrun
2011-05-26swscale: Eliminate rgb24toyv12_c() duplication.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-05-25swscale: document SWS_CPU_CAPS*Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-25Revert removial of SWS flags from e66149e714006d099d1ebfcca3f22ca74fc7dcf4Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-25swscale: remove duplicatiopn of rgb24toyv12_c()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-25Return -1 on invalid input instead of crashing.Jean-Tiare Le Bigot
2011-05-25Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (22 commits) configure: enable memalign_hack automatically when needed swscale: unbreak the build on non-x86 systems. swscale: remove if(bitexact) branch from functions. swscale: remove if(canMMX2BeUsed) conditional. swscale: remove swScale_{c,MMX,MMX2} duplication. swscale: use emms_c(). Move emms_c() from libavcodec to libavutil. tiff: set palette in the context when specified in TIFF_PAL tag rtsp: use strtoul to parse rtptime and seq values. pgssubdec: fix incorrect colors. dvdsubdec: fix incorrect colors. ape: Allow demuxing of files with metadata tags. swscale: remove dead macro WRITEBGR24OLD. swscale: remove AMD3DNOW "optimizations". swscale: remove duplicate code in ppc/ subdirectory. swscale: remove duplicated x86/ functions. swscale: force --enable-runtime-cpudetect and remove SWS_CPU_CAPS_*. vsrc_buffer.h: add file doxy vsrc_buffer: tweak error message in init() msmpeg4: reindent. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>