highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't mangle the input strings. The caller may want to reuse it later.

Browse Source 
Commited in SoC by Bobby Bingham on 2007-07-15 16:13:17

Originally committed as revision 12691 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak
2008-04-04 20:06:10 +00:00
parent 65a4bd9c9e
commit fc27b8081e
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavfilter/avfiltergraph.c
View File

@ -22,6 +22,7 @@
#include <string.h> #include <string.h>
#include <stddef.h> #include <stddef.h>
#include "avstring.h"
#include "avfilter.h" #include "avfilter.h"
#include "avfiltergraph.h" #include "avfiltergraph.h"
@ -55,16 +56,17 @@ void avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
graph->filters[graph->filter_count - 1] = filter; graph->filters[graph->filter_count - 1] = filter;
} }
static AVFilterContext *create_filter_with_args(char *filter) static AVFilterContext *create_filter_with_args(const char *filt)
{ {
AVFilterContext *ret; AVFilterContext *ret;
char *filter = av_strdup(filt); /* copy - don't mangle the input string */
char *name, *args; char *name, *args;
name = filter; name = filter;
if((args = strchr(filter, '='))) { if((args = strchr(filter, '='))) {
/* ensure we at least have a name */ /* ensure we at least have a name */
if(args == filter) if(args == filter)
return NULL; goto fail;
*args ++ = 0; *args ++ = 0;
} }
@ -76,11 +78,15 @@ static AVFilterContext *create_filter_with_args(char *filter)
if(avfilter_init_filter(ret, args)) { if(avfilter_init_filter(ret, args)) {
av_log(NULL, AV_LOG_ERROR, "error initializing filter!\n"); av_log(NULL, AV_LOG_ERROR, "error initializing filter!\n");
avfilter_destroy(ret); avfilter_destroy(ret);
ret = NULL; goto fail;
} }
} else av_log(NULL, AV_LOG_ERROR, "error creating filter!\n"); } else av_log(NULL, AV_LOG_ERROR, "error creating filter!\n");
return ret; return ret;
fail:
av_free(filter);
return NULL;
} }
int avfilter_graph_load_chain(AVFilterGraph *graph, int avfilter_graph_load_chain(AVFilterGraph *graph,