generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2013-04-11 03:38:34 +02:00
parent 670e0f7f66 a42d6e6c4c
commit 3a3d984445
3 changed files with 23 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
doc/filters.texi
View File

@@ -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