diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-09 19:09:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-09 19:31:56 +0200 |
| commit | 9f088a1ed4d34f0cf4244a4b80960af9e8f23dfc (patch) | |
| tree | 049c8db5ee42c462bfe3d999146a224cff29bf03 /doc/ffmpeg.texi | |
| parent | e1a983e6010930ab742bede275de1ccf921485b7 (diff) | |
| parent | f69f4036f8cc3b673864dce01d2714fd5e49e8da (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: reduce excessive inlining of mpeg_motion()
mpegvideo: convert mpegvideo_common.h to a .c file
build: factor out mpegvideo.o dependencies to CONFIG_MPEGVIDEO
Move MASK_ABS macro to libavcodec/mathops.h
x86: move MANGLE() and related macros to libavutil/x86/asm.h
x86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h
aacdec: Don't fall back to the old output configuration when no old configuration is present.
rtmp: Add message tracking
rtsp: Support mpegts in raw udp packets
rtsp: Support receiving plain data over UDP without any RTP encapsulation
rtpdec: Remove an unused include
rtpenc: Remove an av_abort() that depends on user-supplied data
vsrc_movie: discourage its use with avconv.
avconv: allow no input files.
avconv: prevent invalid reads in transcode_init()
avconv: rename OutputStream.is_past_recording_time to finished.
Conflicts:
configure
doc/filters.texi
ffmpeg.c
ffmpeg.h
libavcodec/Makefile
libavcodec/aacdec.c
libavcodec/mpegvideo.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffmpeg.texi')
| -rw-r--r-- | doc/ffmpeg.texi | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 905e5f31a3..2908ad8a71 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -965,6 +965,9 @@ the matching type. Output link labels are referred to with @option{-map}. Unlabeled outputs are added to the first output file. +Note that with this option it is possible to use only lavfi sources without +normal input files. + For example, to overlay an image over video @example ffmpeg -i video.mkv -i image.png -filter_complex '[0:v][1:v]overlay[out]' -map @@ -987,6 +990,11 @@ graph will be added to the output file automatically, so we can simply write @example ffmpeg -i video.mkv -i image.png -filter_complex 'overlay' out.mkv @end example + +To generate 5 seconds of pure red video using lavfi @code{color} source: +@example +ffmpeg -filter_complex 'color=red' -t 5 out.mkv +@end example @end table As a special exception, you can use a bitmap subtitle stream as input: it |