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
2012-10-31Fix #1827, segfault with XXCH samples when downsampling.Nick Brereton
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: aacdec: Drop some unused function arguments x86: Fix assembly with NASM x86: fmtconvert: Refactor cvtps2pi emulation through cpuflags Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31Merge commit 'be923ed659016350592acb9b3346f706f8170ac5'Michael Niedermayer
* commit 'be923ed659016350592acb9b3346f706f8170ac5': x86: fmtconvert: port to cpuflags x86: MMX2 ---> MMXEXT in macro names Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31Merge commit '652f5185945c8405fc57aed353286858df8d066f'Michael Niedermayer
* commit '652f5185945c8405fc57aed353286858df8d066f': x86: mmx2 ---> mmxext in comments and messages Conflicts: libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'Michael Niedermayer
* commit '04581c8c77ce779e4e70684ac45302972766be0f': x86: yasm: Use complete source path for macro helper %includes Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'Michael Niedermayer
* commit '6860b4081d046558c44b1b42f22022ea341a2a73': x86: include x86inc.asm in x86util.asm cng: Reindent some incorrectly indented lines cngdec: Allow flushing the decoder cngdec: Make the dbov variable have the right unit cngdec: Fix the memset size to cover the full array cngdec: Update the LPC coefficients after averaging the reflection coefficients configure: fix print_config() with broke awks Conflicts: libavcodec/x86/ac3dsp.asm libavcodec/x86/dct32.asm libavcodec/x86/deinterlace.asm libavcodec/x86/dsputil.asm libavcodec/x86/dsputilenc.asm libavcodec/x86/fft.asm libavcodec/x86/fmtconvert.asm libavcodec/x86/h264_chromamc.asm libavcodec/x86/h264_deblock.asm libavcodec/x86/h264_deblock_10bit.asm libavcodec/x86/h264_idct.asm libavcodec/x86/h264_idct_10bit.asm libavcodec/x86/h264_intrapred.asm libavcodec/x86/h264_intrapred_10bit.asm libavcodec/x86/h264_weight.asm libavcodec/x86/vc1dsp.asm libavcodec/x86/vp3dsp.asm libavcodec/x86/vp56dsp.asm libavcodec/x86/vp8dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31aacdec: Drop some unused function argumentsDiego Biurrun
2012-10-31av_get_audio_frame_duration: add IACPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-31pix_fmt_info: add 9/10 bit YUVA formatsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31x86: fmtconvert: port to cpuflagsDiego Biurrun
2012-10-31x86: fmtconvert: Refactor cvtps2pi emulation through cpuflagsDiego Biurrun
2012-10-31x86: MMX2 ---> MMXEXT in macro namesDiego Biurrun
2012-10-31x86: mmx2 ---> mmxext in comments and messagesDiego Biurrun
2012-10-31x86: yasm: Use complete source path for macro helper %includesDiego Biurrun
This is more consistent with the way we handle C #includes and it simplifies the build system.
2012-10-31x86: include x86inc.asm in x86util.asmDiego Biurrun
This is necessary to allow refactoring some x86util macros with cpuflags.
2012-10-31av_get_audio_frame_duration: add G723_1Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-30av_get_audio_frame_duration: fix IMCMichael Niedermayer
Fixes Ticket1658 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30lavc: const correctness for avpicture_fill()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-30Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: pixfmt: support more yuva formats swscale: support gray to 9bit and 10bit formats configure: rewrite print_config() function using awk FATE: fix (AD)PCM test dependencies broken in e519990 Use ptrdiff_t instead of int for intra pred "stride" function parameter. x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes. Conflicts: libavcodec/h264pred.c libavcodec/h264pred_template.c libavutil/pixfmt.h libswscale/swscale_unscaled.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30ff: fix case where image does not have alpha channelPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-30cng: Reindent some incorrectly indented linesMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-30cngdec: Allow flushing the decoderMartin Storsjö
After a flush, don't average the output envelope and energy with previous iterations. Also start directly from the target values for the first iteration at startup. Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-30cngdec: Make the dbov variable have the right unitMartin Storsjö
Previously the unit of the variable was Bov, not dBov. Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-30cngdec: Fix the memset size to cover the full arrayMartin Storsjö
This was a leftover from previous iterations of the code, where the refl coef arrays were statically allocated. Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-30cngdec: Update the LPC coefficients after averaging the reflection coefficientsMartin Storsjö
I somehow messed up the placement of this one. Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-30Merge commit '08b028c18dc31b6de741861b9555669dcca4d12a'Michael Niedermayer
* commit '08b028c18dc31b6de741861b9555669dcca4d12a': Remove INIT_AVX from x86inc.asm. Remove usage of INIT_AVX in h264_intrapred_10bit.asm. dv: fix indentation Conflicts: libavformat/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8'Michael Niedermayer
* commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8': dv: use AVStream.index instead of abusing AVStream.id lavfi: add ashowinfo filter avcodec: Add a RFC 3389 comfort noise codec lpc: Add a function for calculating reflection coefficients from samples lpc: Add a function for calculating reflection coefficients from autocorrelation coefficients lavr: document upper bound on number of output samples. lavr: add general API usage doxy indeo3: remove duplicate capabilities line. fate: ac3: Add dependencies Conflicts: Changelog doc/filters.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h libavfilter/Makefile libavfilter/af_ashowinfo.c libavfilter/allfilters.c libavfilter/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30Merge commit '381dc1a5ec0925b281c573457c413ae643567086'Michael Niedermayer
* commit '381dc1a5ec0925b281c573457c413ae643567086': fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups fate: Add shorthands for acodec PCM and ADPCM tests avconv: Drop unused function argument from do_video_stats() cmdutils: Conditionally compile libswscale-related bits aacenc: Drop some unused function arguments rtsp: Avoid a cast when calling strtol nut: support textual data nutenc: verbosely report unsupported negative pts Conflicts: cmdutils.c ffmpeg.c libavformat/nut.c libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30rawdec: check avpicture_get_size() return valueMichael Niedermayer
Fixes CID205019 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30Partly revert f174fba: yop decoder does not support direct rendering.Carl Eugen Hoyos
2012-10-30pixfmt: support more yuva formatsLuca Barbato
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-10-30Partly revert f174fba: indeo3 decoder does not support direct rendering.Carl Eugen Hoyos
2012-10-30vqavideo: return more meaningful error codesPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-30mpeg12videodec: dont pass mpeg1 VBR special case value on as bitrate.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30mpeg12video_parser: Wrong bit rate in MPEG2 video file (Ticket #1862)Heesuk Jung
mpegvideo parser sometime get wrong stream bit rate which is 0x3FFFF*400. But maximum bit rate of MPEG2 video is up to 80 Mbps in case 1920x1080 resolution. When bit rate is 0x3FFFF*400, set bit rate zero. * Problematic link https://docs.google.com/open?id=0B6r7ZfWFIypCUkhPa0dyTGdFSE0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30mpeg12parser: cleanup bitrate parsing.Michael Niedermayer
This fixes several bugs in the code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30Use ptrdiff_t instead of int for intra pred "stride" function parameter.Ronald S. Bultje
This way, SIMD-optimized functions don't have to sign-extend their stride argument manually to be able to do pointer arithmetic.
2012-10-30x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes.Ronald S. Bultje
2012-10-30truemotion2: remove unused variableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30Remove usage of INIT_AVX in h264_intrapred_10bit.asm.Ronald S. Bultje
Replace INIT_AVX by INIT_XMM avx. Port the whole file to use cpuflag based function declarations. Remove (now unused) cputype argument in function declaration macros. Change function prototypes to have mmx2 instead of mmxext as suffix, since that's required by cpuflags.
2012-10-30pictordec: decode 1bpp / 4bpp images when extra header marker is missingPiotr Bandurski
based on 56f6628bca66ef3b6a1028fcf0f52dbe01115d89 samples: http://www.datafilehost.com/download-94b5bc1b.html Reviewed-and-Tested-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30avuidec: correct long_namePiotr Bandurski
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30lavc: remove duplicated .capabilitiesPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-30avcodec: Add a RFC 3389 comfort noise codecMartin Storsjö
This isn't too useful as a normal codec, but can be used in voip style applications. The decoder updates the noise generator parameters when a packet is given to it for decoding, but if called with an empty packet, it generates more noise according to the last parameters. Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-29lpc: Add a function for calculating reflection coefficients from samplesMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-29lpc: Add a function for calculating reflection coefficients from ↵Justin Ruggles
autocorrelation coefficients Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-29indeo3: remove duplicate capabilities line.Anton Khirnov
2012-10-29aacenc: Drop some unused function argumentsDiego Biurrun
2012-10-29Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lavc: add CODEC_CAP_DR1 to all video decoders missing them rtpdec: Cosmetic cleanup Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-29lavc: add CODEC_CAP_DR1 to all video decoders missing themAnton Khirnov