breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff'

Browse Source 
* commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff':
  af_resample: switch to an AVOptions-based system.

Conflicts:
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-04-10 13:27:33 +02:00
parent d2752ef061 4fa1f52e33
commit 828044aca2
3 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/avfilter.h
View File

@@ -451,6 +451,13 @@ typedef struct AVFilter {
*/
int (*init)(AVFilterContext *ctx, const char *args);
/**
* Should be set instead of init by the filters that want to pass a
* dictionary of AVOptions to nested contexts that are allocated in
* init.
*/
int (*init_dict)(AVFilterContext *ctx, AVDictionary **options);
/**
* Filter uninitialization function. Should deallocate any memory held
* by the filter, release any buffer references, etc. This does not need