History

graphparser: prefer void * over AVClass * for log contexts

Stefano Sabatini committed 15 years ago

Commit 64abd371 parent 59cef181 file · +7 −7Browse files

Unified · Split

libavfilter/graphparser.c+7−7
@@ -36,7 +36,7 @@ · 35 unmodified lines
36 */36 */
37static int link_filter(AVFilterContext *src, int srcpad,37static int link_filter(AVFilterContext *src, int srcpad,
38 AVFilterContext *dst, int dstpad,38 AVFilterContext *dst, int dstpad,
39 AVClass *log_ctx)39 void *log_ctx)
40{40{
41 int ret;41 int ret;
42 if ((ret = avfilter_link(src, srcpad, dst, dstpad))) {42 if ((ret = avfilter_link(src, srcpad, dst, dstpad))) {
@@ -55,7 +55,7 @@ static int link_filter(AVFilterContext *src, int srcpad, · 12 unmodified lines
55 * @return a pointer (that need to be freed after use) to the name55 * @return a pointer (that need to be freed after use) to the name
56 * between parenthesis56 * between parenthesis
57 */57 */
58static char *parse_link_name(const char **buf, AVClass *log_ctx)58static char *parse_link_name(const char **buf, void *log_ctx)
59{59{
60 const char *start = *buf;60 const char *start = *buf;
61 char *name;61 char *name;
@@ -92,7 +92,7 @@ static char *parse_link_name(const char **buf, AVClass *log_ctx) · 30 unmodified lines
92 * @return 0 in case of success, a negative AVERROR code otherwise92 * @return 0 in case of success, a negative AVERROR code otherwise
93 */93 */
94static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int index,94static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int index,
95 const char *filt_name, const char *args, AVClass *log_ctx)95 const char *filt_name, const char *args, void *log_ctx)
96{96{
97 AVFilter *filt;97 AVFilter *filt;
98 char inst_name[30];98 char inst_name[30];
@@ -153,7 +153,7 @@ static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int ind · 54 unmodified lines
153 * @return 0 in case of success, a negative AVERROR code otherwise153 * @return 0 in case of success, a negative AVERROR code otherwise
154 */154 */
155static int parse_filter(AVFilterContext **filt_ctx, const char **buf, AVFilterGraph *graph,155static int parse_filter(AVFilterContext **filt_ctx, const char **buf, AVFilterGraph *graph,
156 int index, AVClass *log_ctx)156 int index, void *log_ctx)
157{157{
158 char *opts = NULL;158 char *opts = NULL;
159 char *name = av_get_token(buf, "=,;[\n");159 char *name = av_get_token(buf, "=,;[\n");
@@ -203,7 +203,7 @@ static void insert_inout(AVFilterInOut **inouts, AVFilterInOut *element) · 43 unmodified lines
203 203
204static int link_filter_inouts(AVFilterContext *filt_ctx,204static int link_filter_inouts(AVFilterContext *filt_ctx,
205 AVFilterInOut **curr_inputs,205 AVFilterInOut **curr_inputs,
206 AVFilterInOut **open_inputs, AVClass *log_ctx)206 AVFilterInOut **open_inputs, void *log_ctx)
207{207{
208 int pad = filt_ctx->input_count, ret;208 int pad = filt_ctx->input_count, ret;
209 209
@@ -251,7 +251,7 @@ static int link_filter_inouts(AVFilterContext *filt_ctx, · 41 unmodified lines
251}251}
252 252
253static int parse_inputs(const char **buf, AVFilterInOut **curr_inputs,253static int parse_inputs(const char **buf, AVFilterInOut **curr_inputs,
254 AVFilterInOut **open_outputs, AVClass *log_ctx)254 AVFilterInOut **open_outputs, void *log_ctx)
255{255{
256 int pad = 0;256 int pad = 0;
257 257
@@ -286,7 +286,7 @@ static int parse_inputs(const char **buf, AVFilterInOut **curr_inputs, · 28 unmodified lines
286 286
287static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs,287static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs,
288 AVFilterInOut **open_inputs,288 AVFilterInOut **open_inputs,
289 AVFilterInOut **open_outputs, AVClass *log_ctx)289 AVFilterInOut **open_outputs, void *log_ctx)
290{290{
291 int ret, pad = 0;291 int ret, pad = 0;
292 292

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