diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 03:38:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 03:41:08 +0200 |
| commit | 3a3d984445f0e49e692f712ebb51a4b7e6bb006c (patch) | |
| tree | 7c7df400fe0f47c341391639d29b7c0ac89832d7 /doc/filters.texi | |
| parent | 670e0f7f66207227d70898b07fe0eace767cd027 (diff) | |
| parent | a42d6e6c4c19912b73cae8ca9133b4202667c303 (diff) | |
| download | ffmpeg-3a3d984445f0e49e692f712ebb51a4b7e6bb006c.tar.gz | |
Merge commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303'
* commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303':
vsrc_movie: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/src_movie.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/filters.texi')
| -rw-r--r-- | doc/filters.texi | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index a71a145941..bd74a77514 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -7156,15 +7156,12 @@ stream by default. Read audio and/or video stream(s) from a movie container. -It accepts the syntax: @var{movie_name}[:@var{options}] where -@var{movie_name} is the name of the resource to read (not necessarily -a file but also a device or a stream accessed through some protocol), -and @var{options} is an optional sequence of @var{key}=@var{value} -pairs, separated by ":". - -The description of the accepted options follows. +This filter accepts the following options: @table @option +@item filename +The name of the resource to read (not necessarily a file but also a device or a +stream accessed through some protocol). @item format_name, f Specifies the format assumed for the movie to read, and can be either |