RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
41,777 Commits 36 Branches 398 Tags 232 MiB
Commit Graph

20 Commits

Author SHA1 Message Date
Stefano Sabatini fe16ca1b91 lavfi/ocv: fix compilation after internalization of public functions 
Include missing required internal headers.
 2012-06-06 23:22:13 +02:00
Michael Niedermayer ad60b3b181 Merge remote-tracking branch 'qatar/master' 
* 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-06 01:08:33 +02:00
Anton Khirnov 803391f719 lavfi: remove request/poll and drawing functions from public API on next bump 
They are only useful inside filters and we don't allow user filters for
now.
 2012-06-05 09:38:16 +02:00
Anton Khirnov b74a1da49d lavfi: make formats API private on next bump. 
It is only useful inside filters and we don't allow user filters for
now.
 2012-06-05 09:37:30 +02:00
Reimar Döffinger 5af7daabc4 Mark AVFilterPad[] compound literals as const. 
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-11-06 00:05:14 +01:00
Stefano Sabatini 9bc8bcddbd vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h 
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-07-18 12:33:13 +02:00
Stefano Sabatini 5a0a6ae639 ocv: replace FF_INTERNAL_MEM_TYPE_MAX_VALUE with SIZE_MAX 
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-20 20:54:40 +02:00
Mina Nagy Zaki fd2c0a5db2 lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
Stefano Sabatini f1b3f33d48 vf_libopencv: prefer opencv/cxcore.h over cxtypes.h 
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-05-20 11:54:53 +02:00
Stefano Sabatini 6d6351483f ocv: replace FF_INTERNAL_MEM_TYPE_MAX_VALUE with SIZE_MAX 
Fix compilatin after removal of FF_INTERNAL_MEM_TYPE_MAX_VALUE.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-04-21 10:33:03 +02:00
Mans Rullgard 2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Stefano Sabatini 17fc94933b Add erode libopencv filter. 
Originally committed as revision 26097 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-26 11:27:09 +00:00
Stefano Sabatini 91cbb6ba53 Add dilate libopencv filter. 
Originally committed as revision 26096 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-26 11:27:05 +00:00
Stefano Sabatini cf69ad35c5 Redesign the libopencv wrapper to make it more generic. Accept both 
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-12-23 17:24:19 +00:00
Stefano Sabatini 3fa77bde1b In libavfilter, use consistently "Copyright (c)" in the license 
headers.

Originally committed as revision 25838 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-28 10:22:58 +00:00
Stefano Sabatini a6881c6a38 Add missing uses of NULL_IF_CONFIG_SMALL for the filters descriptions. 
Originally committed as revision 25182 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-24 20:41:14 +00:00
Stefano Sabatini dcb90374a3 Cosmetics: fix weird align. 
Originally committed as revision 25134 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-16 08:47:37 +00:00
Stefano Sabatini e6c4a417b3 Use <> for system headers inclusion. 
Originally committed as revision 25133 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-16 08:47:34 +00:00
Stefano Sabatini 0a7d6e01a3 Fix copyright notice, make it more consistent with the rest of FFmpeg. 
Originally committed as revision 25132 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-16 08:47:31 +00:00
Stefano Sabatini 6ebf0bfc17 Implement libopencv smooth filter. 
Originally committed as revision 25118 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-14 13:21:13 +00:00