History

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

S.N. Hemanth Meenakshisundaram committed 16 years ago

Commit bdab6141 parent 98137a16 files · +43 −33Browse files

Showing the changes to libavfilter/avfiltergraph.c (1 of 6 files). Show all

Unified · Split

libavfilter/avfiltergraph.c+2−2
@@ -111,7 +111,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) · 110 unmodified lines
111 int scaler_count = 0;111 int scaler_count = 0;
112 char inst_name[30];112 char inst_name[30];
113 113
114 /* ask all the sub-filters for their supported colorspaces */114 /* ask all the sub-filters for their supported media formats */
115 for(i = 0; i < graph->filter_count; i ++) {115 for(i = 0; i < graph->filter_count; i ++) {
116 if(graph->filters[i]->filter->query_formats)116 if(graph->filters[i]->filter->query_formats)
117 graph->filters[i]->filter->query_formats(graph->filters[i]);117 graph->filters[i]->filter->query_formats(graph->filters[i]);
@@ -197,7 +197,7 @@ int avfilter_graph_config_formats(AVFilterGraph *graph, AVClass *log_ctx) · 79 unmodified lines
197 return -1;197 return -1;
198 198
199 /* Once everything is merged, it's possible that we'll still have199 /* Once everything is merged, it's possible that we'll still have
200 * multiple valid colorspace choices. We pick the first one. */200 * multiple valid media format choices. We pick the first one. */
201 pick_formats(graph);201 pick_formats(graph);
202 202
203 return 0;203 return 0;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t