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

2
libavfilter/avfilter.c
View File

@@ -712,6 +712,8 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
!strcmp(filter->filter->name, "lowpass" ) ||
!strcmp(filter->filter->name, "mandelbrot" ) ||
!strcmp(filter->filter->name, "mptestsrc" ) ||
!strcmp(filter->filter->name, "movie" ) ||
!strcmp(filter->filter->name, "amovie" ) ||
!strcmp(filter->filter->name, "negate" ) ||
!strcmp(filter->filter->name, "noise" ) ||
!strcmp(filter->filter->name, "nullsrc" ) ||