RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
32,594 Commits 37 Branches 400 Tags 279 MiB
Commit Graph

1130 Commits

Author SHA1 Message Date
Michael Niedermayer 39e0accb7a vf_remove_logo: domt access vf->next->query_format() directly but use the API. 
This fixes a crash

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-13 03:52:30 +02:00
Stefano Sabatini 9efae6a161 lavfi: bump minor and update APIchanges after recent updates 
These changes were forgotten in commits:
  lavfi: simplify signature for avfilter_get_audio_buffer() and friends
  (commit 2c0317419b)
and
  lavfi: consistently use int for sample_rate in AVFilterLink and AVFilterBufferRefAudioProps
  (commit 4381bddc9f)
 2011-09-12 22:08:53 +02:00
Michael Niedermayer 9765caec1b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  adpcm: split ADPCM encoders and decoders into separate files.
  doc/avconv: fix typo.
  rv34: check that subsequent slices have the same type as first one.
  smacker demuxer: handle possible av_realloc() failure.
  lavfi: add split filter from soc.
  lavfi: add showinfo filter
  libxavs: add private options corresponding to deprecated global options

Conflicts:
	Changelog
	libavcodec/adpcm.c
	libavfilter/avfilter.h
	libavfilter/vf_showinfo.c
	libavfilter/vf_split.c
	libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-12 21:01:12 +02:00
Stefano Sabatini 4381bddc9f lavfi: consistently use int for sample_rate in AVFilterLink and AVFilterBufferRefAudioProps 
Also consistent with AVCodecContext.sample_rate. Simplify/avoid
pointless type checks and conversions.

Breaks audio API/ABI.
 2011-09-12 18:51:46 +02:00
Stefano Sabatini 2c0317419b lavfi: simplify signature for avfilter_get_audio_buffer() and friends 
The additional parameters were never used and are complicating the
function interface. Also, they were inconsistent with the way the
video API works.

So this assumes that a requested samples buffer will have *always* the
format specified in the requested link.

This breaks audio filtering API and ABI.
 2011-09-12 18:51:18 +02:00
Bobby Bingham 615baa13e4 lavfi: add split filter from soc. 
Some fixes by Stefano.
For detailed authorship see SOC repo

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-12 08:48:16 +02:00
Stefano Sabatini ee42716b07 lavfi: add showinfo filter 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-12 08:48:14 +02:00
Michael Niedermayer f1b5693027 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Add LATM muxer
  v210enc: clip values according to specifications
  v210enc: switch to PIX_FMT_422P10
  v210dec: switch to PIX_FMT_422P10
  AVOptions: remove AVOption.offset <= 0 checks
  AVOptions: deprecate av_opt_set_defaults2
  AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h
  libx264: fix setting some more parameters
  libx264: fix setting the H.264 level
  libx264: add 'direct-pred' private option
  libx264: add 'partitions' private option

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/libx264.c
	libavcodec/v210enc.c
	libavfilter/src_movie.c
	libavformat/version.h
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-07 22:58:39 +02:00
Anton Khirnov 79eff91325 AVOptions: deprecate av_opt_set_defaults2 
It's a hack which was created to allow for multiple options with
different defaults to refer to same field (e.g. 'b' vs 'ab'). There is
no need for it anymore.
 2011-09-07 11:19:43 +02:00
Michael Niedermayer c0323b9c9b avfilter: dont crash on filters with NULL instance names. 
Found-by: Rolf Siegrist
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-06 22:23:15 +02:00
Stefano Sabatini 4f7dfe12ea lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h 
This is done in order to clarify the non-video-specific nature of the
buffersink code, as the result of the video/audio API unification of
the previous commit, and for improving overall consistency.
 2011-09-06 18:51:09 +02:00
Stefano Sabatini c4415f6ec9 lavfi: unify asink_buffer and vsink_buffer API 
The new API is more generic (no distinction between audio/video for
pulling frames), and avoids code duplication.

A backward compatibility layer is kept for avoiding tools ABI breaks
(only for the video binary interface, audio interface was never used
in the tools).
 2011-09-06 18:47:04 +02:00
Michael Niedermayer 845383c358 vf_drawtext: always use expanded_text as we always support strftime() now and dont depend on localtime_r() anymore 
Found-by: Rolf Siegrist
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-05 23:13:59 +02:00
Michael Niedermayer 038a465efc vf_drawtext: make strftime work without localtime_r() 
modern OS should have localtime_r() or return thread locals on localtime() hopefully

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-05 05:16:44 +02:00
Michael Niedermayer b881a2e254 vf_drawtext: Fix reinit to allow color changes. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-04 20:58:13 +02:00
Stefano Sabatini a9c69362ea vsink_buffer: fix void pointer dereference in av_vsink_buffer_get_video_buffer_ref() 2011-08-31 16:27:33 +02:00
Stefano Sabatini 22ee131e85 vf_yadif: add support to yuva420p 2011-08-31 16:11:26 +02:00
Michael Niedermayer 595cfdef97 vf_drawtext: add basetime argument to allow specifying the wall clock time of PTS=0 
the basetime argument also enables useage of pts instead of time()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-30 23:37:49 +02:00
Michael Niedermayer cc2b4e889d libavfilter/graphparser: Avoid spaces in filter instance names. 
This makes it easier to refer to filters where things are seperated by spaces.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-30 22:02:38 +02:00
Michael Niedermayer 3016c7f543 vf_drawtext: fix segfault on reinit 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-30 20:25:58 +02:00
Stefano Sabatini c70e8523af vsrc_testsrc: set more properties in the output frames 2011-08-30 10:03:19 +02:00
Michael Niedermayer ea36c44e84 avfilter_graph_queue_command: Allow queueing commands out of order 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-29 20:55:22 +02:00
Michael Niedermayer 37f9de59d1 avfilter: fix processing multiple commands per frame and filter 
Found-by: Nicolas George
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-29 20:39:34 +02:00
Michael Niedermayer 3d8176d2f5 avfilter: Add avfilter_graph_que_command() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-29 20:16:10 +02:00
Michael Niedermayer f782ce3b4d drawtext: Support changing parameters through reinit command at runtime. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-29 20:16:08 +02:00
Michael Niedermayer 1e5014c7c7 avfilter: Add command passing support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-29 20:16:01 +02:00
Michael Niedermayer 52982dbe47 vf_scale: don't leak SWS context. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-27 17:23:45 +02:00
Stefano Sabatini 24ddfb2bdb lavfi: add amovie source - audio movie source 2011-08-27 12:46:55 +02:00
Michael Niedermayer c8868f28e3 vf_scale: apply the same transform to the aspect during init that is applied per frame 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-27 02:04:37 +02:00
Michael Niedermayer 094a496818 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fifo: add FIFO API test program, and fate test
  fifo: add av_fifo_peek2(), and deprecate av_fifo_peek()
  postprocess.c: filter name needs to be double 0 terminated
  doxygen: fix wrong comment syntax, //< vs. ///<
  doxygen: drop pointless star from pointer variable names
  Replace deprecated av_find_stream_info() by avformat_find_stream_info().
  xmv: eliminate superfluous zeroing of zero data
  configure: fix typo in avconv dependency list

Conflicts:
	configure
	doc/APIchanges
	libavutil/Makefile
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-26 23:18:54 +02:00
Diego Biurrun 0249478756 doxygen: fix wrong comment syntax, //< vs. ///< 2011-08-26 18:34:28 +02:00
Stefano Sabatini 276f43be68 lavfi: rename vsrc_movie.c to src_movie.c 
The file is going to contain the amovie source, so give it a less
specific name.
 2011-08-23 15:45:53 +02:00
Stefano Sabatini e26782a9b4 lavfi: add ff_parse_pixel_format() internal function, and use it 
Reduce code duplication.
 2011-08-23 15:45:44 +02:00
Stefano Sabatini e0ddc2e953 vsrc_movie: rename video movie specific callbacks, prefix them with "movie" 2011-08-22 10:40:50 +02:00
Stefano Sabatini df4c7ae9db asink_abuffer: extend ABufferSinkContext to make it accept lists of formats in input 
This is required for the pending lavfi indev extension, also
consistent with the video buffer sink.
 2011-08-22 10:34:43 +02:00
Stefano Sabatini 3e4666f34c vsrc_movie: create media agnostic movie init and uninit routines 
Allow factorization for the pending work on the audio movie source.
 2011-08-22 10:34:43 +02:00
Stefano Sabatini 8aa62bb950 af_aformat: use evil ADD_FORMATS macro for cutting out duplicated code 2011-08-22 10:34:43 +02:00
Stefano Sabatini 34c997599e vsrc_testsrc: allow to set the sample aspect ratio 
Add the sar option. Useful for debugging/testing purposes.
 2011-08-21 15:27:09 +02:00
Stefano Sabatini c5d9bd1938 asrc_abuffer: pass non-const string to strtok_r in init() 
Fix GCC warning:
asrc_abuffer.c: In function ‘init’:
asrc_abuffer.c:258: warning: passing argument 1 of ‘strtok_r’ discards qualifiers from pointer target type
 2011-08-21 11:38:30 +02:00
Mina Nagy Zaki 587c8ab912 lavfi: add asrc_abuffer - audio buffer source 
Originally based on code by Stefano Sabatini and S. N. Hemanth.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-08-21 11:37:57 +02:00
Stefano Sabatini e30a0b1b3b lavfi: add ashowinfo filter 
Useful for debugging.
 2011-08-20 15:00:23 +02:00
Mina Nagy Zaki 3a9e227fb1 lavfi: add aresample filter 
Based on a patch by Stefano.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-08-17 13:12:40 +02:00
Stefano Sabatini 86ca51acb0 af_format: prefer strtok_r() over strsep() 
strsep() is not POSIX compliant, and thus not supported on some platform.
Fix compilation on Solaris.
 2011-08-16 17:00:57 +02:00
Stefano Sabatini a719679561 lavfi: complain and exit for invalid named values in ff_parse_packing_format() 2011-08-16 17:00:49 +02:00
Michael Niedermayer abf6b0d1ea af_aformat: hotfix compile due to strsep() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-15 03:35:25 +02:00
Stefano Sabatini b854c2a709 vf_unsharp: set default chroma size value to 5x5 
The previous default value 0x0 was not good, since it is not even
valid.
 2011-08-14 16:29:44 +02:00
Stefano Sabatini 63b61d55f9 vf_unsharp: fix out-of-buffer read 
In apply_unsharp(), when y is >= height, prevent out-of-buffer reading
from src, read from the last buffer line in src2 instead.

The check was implemented in the original unsharp libmpcodecs code and
lost in the port.

This also fixes output discrepancy between the two filters.
 2011-08-14 16:28:54 +02:00
Stefano Sabatini 6e89bdfecf lavfi: remove delogo mp wrapper 
The delogo filter has been natively integrated into libavfilter,
simplify.
 2011-08-14 12:26:44 +02:00
Stefano Sabatini 2701f6cc6a lavfi: port libmpcodecs delogo filter 
The ported filter supports named option parsing and more YUV formats.
 2011-08-14 12:17:10 +02:00
Mina Nagy Zaki 0a2295815d lavfi: add aformat filter 
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-08-14 10:31:23 +02:00