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

16 Commits

Author SHA1 Message Date
Michael Niedermayer d0ad91c258 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  os_support: Define SHUT_RD, SHUT_WR and SHUT_RDWR on OS/2
  http: Add support for reading http POST reply headers
  http: Add http_shutdown() for ending writing of posts
  tcp: Allow signalling end of reading/writing
  avio: Add a function for signalling end of reading/writing
  lavfi: fix comment, audio is supported now.
  lavfi: fix incorrect comment.
  lavfi: remove avfilter_null_* from public API on next bump.
  lavfi: remove avfilter_default_* from public API on next bump.
  lavfi: deprecate default config_props() callback and refactor avfilter_config_links()
  avfiltergraph: smarter sample format selection.
  avconv: rename transcode_audio/video to decode_audio/video.
  asyncts: reset delta to 0 when it's not used.
  x86: lavc: use %if HAVE_AVX guards around AVX functions in yasm code.
  dwt: return errors from ff_slice_buffer_init()

Conflicts:
	ffmpeg.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/formats.c
	libavfilter/version.h
	libavfilter/vf_blackframe.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_format.c
	libavfilter/vf_showinfo.c
	libavfilter/video.c
	libavfilter/video.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-23 21:48:31 +02:00
Anton Khirnov c04c533f62 lavfi: remove avfilter_null_* from public API on next bump. 
Those functions are only useful inside filters. It is better to not
support user filters until the API is more stable.
 2012-05-22 21:36:23 +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
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 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
S.N. Hemanth Meenakshisundaram ecc8dada37 Rename AVFilterPicRef to AVFilterBufferRef. 
The struct is going to be used for storing audio buffer references as
well, and the new name is more generic.

Patch by S.N. Hemanth Meenakshisundaram @smeenaks@ucsd@edu@.

Originally committed as revision 24730 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-07 01:15:19 +00:00
Diego Biurrun ba87f0801d Remove explicit filename from Doxygen @file commands. 
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 14:45:34 +00:00
Stefano Sabatini 72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Bobby Bingham d313e17ab1 Use the new null callbacks to simplify filters and reduce duplicated code. 
Originally committed as revision 22595 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-18 23:13:02 +00:00
Stefano Sabatini ec7ab610d5 Extend the slice filter to make it issue slice height values randomly 
choosen between 8 and 32 when the supplied parameter is the string
"random".

This is useful for testing the slice support, but it is not supposed
to be used for other purposes and this interface may change in the
future, thus it is not documented.

The randomization algorithm adopted is the standard Numerical Recipes
LCG.

Originally committed as revision 22505 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-13 10:41:25 +00:00
Stefano Sabatini b4b6645655 Avoid usage of avcodec_get_pix_fmt_name() and 
avcodec_get_chroma_sub_sample(), directly access
av_pix_fmt_descriptors instead.

Remove some of the dependancies of lavfi on lavc.

Originally committed as revision 21575 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-31 16:33:29 +00:00
Stefano Sabatini 3a1acfd79a Reindent after the last commit. 
Originally committed as revision 20755 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-06 17:41:49 +00:00
Stefano Sabatini bf972d5e1c Fix slicify when the slice_direction is negative, make it send slices 
from the bottom to the top one.

Originally committed as revision 20754 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-06 17:40:41 +00:00
Stefano Sabatini a13a543797 Add a slice_dir parameter to avfilter_draw_slice(). 
Avoid the need to implement slice direction detection code, thus
reducing code duplication.

See the thread:
"[FFmpeg-devel] [PATCH] Add a slice_dir parameter to avfilter_start_frame()".

Originally committed as revision 20734 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-04 23:26:13 +00:00
Stefano Sabatini bc37ec923d Add slicify video filter. 
Originally committed as revision 20445 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-03 22:41:38 +00:00