Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-06-27Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'Michael Niedermayer
* commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a': lavfi: remove 'opaque' parameter from AVFilter.init() mov: do not try to read total disc/track number if data atom is too short. avconv: fix -force_key_frames dxva2_h264: fix signaling of mbaff frames x86: fft: elf64: fix PIC build Conflicts: ffmpeg.c libavcodec/v210dec.h libavfilter/asrc_anullsrc.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_overlay.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-26lavfi: make filters less verbose.Anton Khirnov
2012-06-26lavfi: remove 'opaque' parameter from AVFilter.init()Anton Khirnov
It is not used in any filters currently and is inherently evil. If passing binary data to filters is required in the future, it should be done with some AVOptions-based system.
2012-06-10vf_libopencv: add missing headers.Anton Khirnov
Fix build after b74a1da4.
2012-06-07lavfi/ocv: fix compilation after internalization of public functionsStefano Sabatini
Include missing required internal headers.
2012-06-06Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: vorbis: Validate that the floor 1 X values contain no duplicates. avprobe: Identify codec probe failures rather than calling them unsupported codecs. avformat: Probe codecs at score 0 on buffer exhaustion conditions. avformat: Factorize codec probing. Indeo Audio decoder imc: make IMDCT support stereo output imc: move channel-specific data into separate context lavfi: remove request/poll and drawing functions from public API on next bump lavfi: make avfilter_insert_pad and pals private on next bump. lavfi: make formats API private on next bump. avplay: use buffersrc instead of custom input filter. avtools: move buffer management code from avconv to cmdutils. avconv: don't use InputStream in the buffer management code. avconv: fix exiting when max frames is reached. mpc8: fix maximum bands handling aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono. Conflicts: Changelog cmdutils.h ffmpeg.c ffplay.c ffprobe.c libavcodec/avcodec.h libavcodec/mpc8.c libavcodec/v210dec.h libavcodec/version.h libavcodec/vorbisdec.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.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_fifo.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_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_yadif.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-05lavfi: remove request/poll and drawing functions from public API on next bumpAnton Khirnov
They are only useful inside filters and we don't allow user filters for now.
2012-06-05lavfi: make formats API private on next bump.Anton Khirnov
It is only useful inside filters and we don't allow user filters for now.
2011-11-06Mark AVFilterPad[] compound literals as const.Reimar Döffinger
GCC 4.6.2 at least still seems to fail to put them in .rodata though, see also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37303 Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-07-18vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.hStefano Sabatini
cxtypes.h works with version 2.1 and older, cxcore.h works with 2.2 and older. Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-06-20ocv: replace FF_INTERNAL_MEM_TYPE_MAX_VALUE with SIZE_MAXStefano Sabatini
Fix compilatin after removal of FF_INTERNAL_MEM_TYPE_MAX_VALUE. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-06-20lavfi: add layout negotiation fields and helper functions.Mina Nagy Zaki
2011-05-20vf_libopencv: prefer opencv/cxcore.h over cxtypes.hStefano Sabatini
Require the presence of opencv/cxcore.h in place of opencv/cxtypes.h, which has been removed. Fix compilation with libopencv > 2.1.0. Fix trac issue #221.
2011-04-21ocv: replace FF_INTERNAL_MEM_TYPE_MAX_VALUE with SIZE_MAXStefano Sabatini
Fix compilatin after removal of FF_INTERNAL_MEM_TYPE_MAX_VALUE. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2010-12-26Add erode libopencv filter.Stefano Sabatini
Originally committed as revision 26097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-26Add dilate libopencv filter.Stefano Sabatini
Originally committed as revision 26096 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-23Redesign the libopencv wrapper to make it more generic. Accept bothStefano Sabatini
FILTERNAME=ARGS and FILTERNAME:ARGS syntax. The same filter class will be used for managing all the libopencv filtering functions. Originally committed as revision 26079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-28In libavfilter, use consistently "Copyright (c)" in the licenseStefano Sabatini
headers. Originally committed as revision 25838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-25Add missing uses of NULL_IF_CONFIG_SMALL for the filters descriptions.Stefano Sabatini
Originally committed as revision 25182 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-16Cosmetics: fix weird align.Stefano Sabatini
Originally committed as revision 25134 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-16Use <> for system headers inclusion.Stefano Sabatini
Originally committed as revision 25133 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-16Fix copyright notice, make it more consistent with the rest of FFmpeg.Stefano Sabatini
Originally committed as revision 25132 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-14Implement libopencv smooth filter.Stefano Sabatini
Originally committed as revision 25118 to svn://svn.ffmpeg.org/ffmpeg/trunk