diff options
| author | S.N. Hemanth Meenakshisundaram <smeenaks@ucsd.edu> | 2010-07-22 11:12:47 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-07-22 11:12:47 +0000 |
| commit | bdab614be8df5681b7fbb89abfd08312f2686279 (patch) | |
| tree | 0bb0e0fcbf6944d69ab2567197fbd52aa2bb281f /libavfilter/avfiltergraph.c | |
| parent | 98137a1a5b1a4438ab4d84e63a957dc83c7dacaf (diff) | |
| download | ffmpeg-bdab614be8df5681b7fbb89abfd08312f2686279.tar.gz | |
Generalize pixel format enum fields to int formats.
This is needed to make the libavfilter framework work with audio
filters.
In particular add a type field to AVFilterLink, change the field types:
enum PixelFormat format -> int format in AVFilterBuffer
enum PixelFormat *formats -> int *formats in AVFilterFormats
enum PixelFormat *format -> int format in AVFilterLink
and change the function signatures:
AVFilterFormats *avfilter_make_format_list(const enum PixelFormat *pix_fmts); ->
AVFilterFormats *avfilter_make_format_list(const int *fmts);
int avfilter_add_colorspace(AVFilterFormats **avff, enum PixelFormat pix_fmt); ->
int avfilter_add_format(AVFilterFormats **avff, int fmt);
AVFilterFormats *avfilter_all_colorspaces(void); ->
AVFilterFormats *avfilter_all_formats(enum AVMediaType type);
This change breaks libavfilter API/ABI.
Patch by S.N. Hemanth Meenakshisundaram |smeenaks|ucsd|edu|.
Originally committed as revision 24424 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter/avfiltergraph.c')
| -rw-r--r-- | libavfilter/avfiltergraph.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 9ad6536306..6f219a62b5 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -111,7 +111,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) int scaler_count = 0; char inst_name[30]; - /* ask all the sub-filters for their supported colorspaces */ + /* ask all the sub-filters for their supported media formats */ for(i = 0; i < graph->filter_count; i ++) { if(graph->filters[i]->filter->query_formats) graph->filters[i]->filter->query_formats(graph->filters[i]); @@ -197,7 +197,7 @@ int avfilter_graph_config_formats(AVFilterGraph *graph, AVClass *log_ctx) return -1; /* Once everything is merged, it's possible that we'll still have - * multiple valid colorspace choices. We pick the first one. */ + * multiple valid media format choices. We pick the first one. */ pick_formats(graph); return 0; |