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-07-28Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: proresdsp: port x86 assembly to cpuflags. lavr: x86: improve non-SSE4 version of S16_TO_S32_SX macro lavfi: better channel layout negotiation alac: check for truncated packets alac: reverse lpc coeff order, simplify filter lavr: add x86-optimized mixing functions x86: add support for fmaddps fma4 instruction with abstraction to avx/sse tscc2: fix typo in array index build: use COMPILE template for HOSTOBJS build: do full flag handling for all compiler-type tools eval: fix printing of NaN in eval fate test. build: Rename aandct component to more descriptive aandcttables mpegaudio: bury inline asm under HAVE_INLINE_ASM. x86inc: automatically insert vzeroupper for YMM functions. rtmp: Check the buffer length of ping packets rtmp: Allow having more unknown data at the end of a chunk size packet without failing rtmp: Prevent reading outside of an allocate buffer when receiving server bandwidth packets Conflicts: Makefile configure libavcodec/x86/proresdsp.asm libavutil/eval.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-27lavfi: better channel layout negotiationJustin Ruggles
Allow substitution of channel pairs in the input for nearby channel pairs in the output in order to get a closer match. Also weigh LFE channel mismatch differently to favor matching the same layout without LFE over one less channel with LFE.
2012-07-27vf_alphamerge: Fix reversed conditionalSteven Robertson
Reviewed-by: Nicolas George
2012-07-26Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: libopenjpeg: support YUV and deep RGB pixel formats Fix typo in v410 decoder. vf_yadif: unset cur_buf on the input link. vf_overlay: ensure the overlay frame does not get leaked. vf_overlay: prevent premature freeing of cur_buf Support urlencoded http authentication credentials rtmp: Return an error when the client bandwidth is incorrect rtmp: Return proper error code in handle_server_bw rtmp: Return proper error code in handle_client_bw rtmp: Return proper error codes in handle_chunk_size lavr: x86: add missing vzeroupper in ff_mix_1_to_2_fltp_flt() vp8: Replace x*155/100 by x*101581>>16. vp3: don't use calls to inline asm in yasm code. x86/dsputil: put inline asm under HAVE_INLINE_ASM. dsputil_mmx: fix incorrect assembly code rtmp: Factorize the code by adding handle_invoke rtmp: Factorize the code by adding handle_chunk_size rtmp: Factorize the code by adding handle_ping rtmp: Factorize the code by adding handle_client_bw rtmp: Factorize the code by adding handle_server_bw Conflicts: libavcodec/libopenjpegdec.c libavcodec/x86/dsputil_mmx.c libavfilter/vf_overlay.c libavformat/Makefile libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-26lavfi/af_amerge: avfilter_copy_buffer_ref_props will overwrite output ptsWilliam Yu
2012-07-26vf_yadif: unset cur_buf on the input link.Anton Khirnov
The buffer is stored internally, so this prevents it from being unreffed automatically. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-07-26vf_overlay: ensure the overlay frame does not get leaked.Anton Khirnov
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-07-26vf_overlay: prevent premature freeing of cur_bufMichael Niedermayer
Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-07-25lavfi/avfilter.h: add doxy for AVFilterLink.out_bufStefano Sabatini
2012-07-25lavfi/avfilter.h: add doxy for AVFilterLink.cur_bufStefano Sabatini
2012-07-25avfilter: Fix printf format string conversion specifierDiego Biurrun
libavfilter/avfilter.c:224:9: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 5 has type ‘int’ [-Wformat]
2012-07-24vf_deshake: set cur_buf to NULL.Nicolas George
Fix a segfault.
2012-07-23vf_colormatrix: add missing semicolonPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-07-23Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: v410dec: Implement explode mode support zerocodec: fix direct rendering. wav: init st to NULL to avoid a false-positive warning. wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit h264: refactor NAL decode loop RTMPTE protocol support RTMPE protocol support rtmp: Add ff_rtmp_calc_digest_pos() rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global swscale: add missing HAVE_INLINE_ASM check. lavfi: place x86 inline assembly under HAVE_INLINE_ASM. vc1: Add a test for interlaced field pictures swscale: Mark all init functions as av_cold swscale: x86: Drop pointless _mmx suffix from filenames lavf: use conditional notation for default codec in muxer declarations. swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM. dsputil: ppc: cosmetics: pretty-print dsputil: x86: add SHUFFLE_MASK_W macro configure: respect CC_O setting in check_cc Conflicts: Changelog configure libavcodec/v410dec.c libavcodec/zerocodec.c libavformat/asfenc.c libavformat/version.h libswscale/utils.c libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-23src_movie: implement multiple outputs.Nicolas George
The audio and video code paths were too different, most of the decoding has been rewritten.
2012-07-23buffersrc: use avfilter_get_buffer_ref_from_frame.Nicolas George
2012-07-23lavfi: add avfilter_get_buffer_ref_from_frame.Nicolas George
2012-07-23lavfi/showwaves: do not set on outlink->out_buf the sent video frameStefano Sabatini
The video frame reference is passed along the filterchain, and is not possessed anymore by the filter. If out_buf is not set to NULL, it will be freed by ff_end_frame() causing a crash.
2012-07-23vf_overlay: fix missed returnMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-23lavfi: change "transmedia" into "multimedia".Nicolas George
2012-07-23lavfi: add concat filter.Nicolas George
2012-07-23lavfi: place x86 inline assembly under HAVE_INLINE_ASM.Ronald S. Bultje
This allows compiling this code using compilers that do not understand gcc-style inline assembly.
2012-07-23Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: FATE: fix the asyncts test build: Drop gcc-specific warning flag from header compilation rule FATE: add a test for the asyncts audio filter. matroskadec: return more correct error code on read error. buffersrc: check ff_get_audio_buffer() for errors. lavfi: check all ff_get_video_buffer() calls for errors. lavfi: check all avfilter_ref_buffer() calls for errors. vf_select: avoid an unnecessary avfilter_ref_buffer(). buffersrc: avoid creating unnecessary buffer reference lavfi: use avfilter_unref_bufferp() where appropriate. vf_fps: add more error checks. vf_fps: fix a memleak on malloc failure. lavfi: check all ff_start_frame/draw_slice/end_frame calls for errors lavfi: add error handling to end_frame(). lavfi: add error handling to draw_slice(). lavfi: add error handling to start_frame(). Conflicts: Makefile ffplay.c libavfilter/buffersrc.c libavfilter/vf_boxblur.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_frei0r.c libavfilter/vf_hflip.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/video.c libavfilter/vsrc_color.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-23Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'Michael Niedermayer
* commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea': Bump libavcodec and libavformat minor versions for G.723.1 decoder and demuxer G.723.1 demuxer and decoder Add a shift parameter to celp_lp_synthesis_filter() libopenjpeg: K&R formatting cosmetics yadif: use emms_c() instead of inline assembly for emms invocations. ac3: don't use different names for option tables in the template file. lavfi: use const for AVFilterPad declarations in all filters. adpcm: don't duplicate identical AVSampleFmt array for each encoder. configure: cosmetics: Group test dependencies together configure: add more passthrough flags in tms470 filter configure: move flag filtering functions out of if/else blocks Conflicts: Changelog configure doc/general.texi libavcodec/Makefile libavcodec/ac3enc_fixed.c libavcodec/allcodecs.c libavcodec/eac3enc.c libavcodec/g723_1.c libavcodec/g723_1_data.h libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/v210dec.h libavcodec/version.h libavfilter/af_anull.c libavfilter/asrc_anullsrc.c libavfilter/f_settb.c libavfilter/fifo.c libavfilter/split.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_copy.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_format.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hflip.c libavfilter/vf_hqdn3d.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_null.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_pixdesctest.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_setpts.c libavfilter/vf_showinfo.c libavfilter/vf_slicify.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_vflip.c libavfilter/vf_yadif.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c libavformat/Makefile libavformat/allformats.c libavformat/g723_1.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-22overlay: clear cur_buf on main input link.Nicolas George
A reference is kept in the queue and freed after use.
2012-07-22lavfi: add alphaextract and alphamerge filtersSteven Robertson
These filters are designed for storing and transmitting video sequences with alpha using higher-efficiency codecs such as x264 which don't natively support an alpha channel. 'alphaextract' takes an input stream with an alpha channel and returns a video containing just the alpha component as a grayscale value; 'alphamerge' takes an RGB or YUV stream and adds an alpha channel recovered from a second grayscale stream. Signed-off-by: Steven Robertson <steven@strobe.cc> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-07-22buffersrc: check ff_get_audio_buffer() for errors.Anton Khirnov
2012-07-22lavfi: check all ff_get_video_buffer() calls for errors.Anton Khirnov
2012-07-22lavfi: check all avfilter_ref_buffer() calls for errors.Anton Khirnov
2012-07-22vf_select: avoid an unnecessary avfilter_ref_buffer().Anton Khirnov
2012-07-22buffersrc: avoid creating unnecessary buffer referenceAnton Khirnov
2012-07-22lavfi: use avfilter_unref_bufferp() where appropriate.Anton Khirnov
2012-07-22vf_fps: add more error checks.Anton Khirnov
2012-07-22vf_fps: fix a memleak on malloc failure.Anton Khirnov
2012-07-22lavfi: check all ff_start_frame/draw_slice/end_frame calls for errorsAnton Khirnov
2012-07-22lavfi: add error handling to end_frame().Anton Khirnov
2012-07-22lavfi: add error handling to draw_slice().Anton Khirnov
2012-07-22lavfi: add error handling to start_frame().Anton Khirnov
2012-07-22yadif: use emms_c() instead of inline assembly for emms invocations.Ronald S. Bultje
2012-07-22lavfi: use const for AVFilterPad declarations in all filters.Ronald S. Bultje
2012-07-22Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lavfi: unref AVFilterLink.out_buf in ff_end_frame(). lavfi: unref AVFilterLink.cur_buf in ff_end_frame(). vsrc_testsrc: avoid an unnecessary avfilter_ref_buffer(). vf_slicify: clear AVFilterLink.cur_buf in start_frame(). vf_settb: simplify start_frame(). vf_fieldorder: don't give up its own reference to the output buffer. vf_pad: don't give up its own reference to the output buffer. vf_overlay: don't access a buffer reference that's been given away. vf_drawtext: don't give up its own reference to the input buffer. vf_gradfun: don't store two pointers to one AVFilterBufferRef. vf_delogo: don't store two pointers to one AVFilterBufferRef. vf_aspect: clear AVFilterLink.cur_buf in start_frame(). lavfi: add avfilter_unref_bufferp() Conflicts: doc/APIchanges libavfilter/avfilter.h libavfilter/buffer.c libavfilter/vf_aspect.c libavfilter/vf_drawtext.c libavfilter/vf_overlay.c libavfilter/vf_pad.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-22vf_overlay: prevent premature freeing of cur_bufMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-22vf_overlay: use unref_bufferP()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-22sink_buffer: prevent prematurely freeing of cur_bufMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-22vf_thumbnail: prevent premature freeing of refMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-22vf_colormatrix: avoid using out_bufMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-20lavfi: unref AVFilterLink.out_buf in ff_end_frame().Anton Khirnov
This reduces code duplication and prevents stale pointers from remaining on the link.
2012-07-20lavfi: unref AVFilterLink.cur_buf in ff_end_frame().Anton Khirnov
This reduces code duplication and prevents stale pointers from remaining on the link.
2012-07-20vsrc_testsrc: avoid an unnecessary avfilter_ref_buffer().Anton Khirnov
2012-07-20vf_slicify: clear AVFilterLink.cur_buf in start_frame().Anton Khirnov
The buffer is passed on to the next filter, so we shouldn't keep any pointers to it.