Originally committed as revision 13297 to svn://svn.ffmpeg.org/ffmpeg/trunk
| ... | ... |
@@ -117,8 +117,8 @@ static char *consume_string(const char **buf) |
| 117 | 117 |
if(*in) in++; |
| 118 | 118 |
break; |
| 119 | 119 |
case 0: |
| 120 |
- case ')': |
|
| 121 |
- case '(':
|
|
| 120 |
+ case ']': |
|
| 121 |
+ case '[': |
|
| 122 | 122 |
case '=': |
| 123 | 123 |
case ',': |
| 124 | 124 |
*out++= 0; |
| ... | ... |
@@ -146,7 +146,7 @@ static void parse_link_name(const char **buf, char **name) |
| 146 | 146 |
if (!*name[0]) |
| 147 | 147 |
goto fail; |
| 148 | 148 |
|
| 149 |
- if (*(*buf)++ != ')') |
|
| 149 |
+ if (*(*buf)++ != ']') |
|
| 150 | 150 |
goto fail; |
| 151 | 151 |
|
| 152 | 152 |
return; |
| ... | ... |
@@ -211,7 +211,7 @@ static int parse_inouts(const char **buf, AVFilterInOut **inout, int firstpad, |
| 211 | 211 |
enum LinkType type, AVFilterContext *filter) |
| 212 | 212 |
{
|
| 213 | 213 |
int pad = firstpad; |
| 214 |
- while (**buf == '(') {
|
|
| 214 |
+ while (**buf == '[') {
|
|
| 215 | 215 |
AVFilterInOut *inoutn = av_malloc(sizeof(AVFilterInOut)); |
| 216 | 216 |
parse_link_name(buf, &inoutn->name); |
| 217 | 217 |
inoutn->type = type; |
| ... | ... |
@@ -225,8 +225,8 @@ static int parse_inouts(const char **buf, AVFilterInOut **inout, int firstpad, |
| 225 | 225 |
|
| 226 | 226 |
static const char *skip_inouts(const char *buf) |
| 227 | 227 |
{
|
| 228 |
- while (*buf == '(') {
|
|
| 229 |
- buf += strcspn(buf, ")"); |
|
| 228 |
+ while (*buf == '[') {
|
|
| 229 |
+ buf += strcspn(buf, "]"); |
|
| 230 | 230 |
buf++; |
| 231 | 231 |
} |
| 232 | 232 |
return buf; |
| ... | ... |
@@ -35,6 +35,6 @@ |
| 35 | 35 |
* @param inpad pad index of the output |
| 36 | 36 |
* @return zero on success, -1 on error |
| 37 | 37 |
*/ |
| 38 |
-int avfilter_graph_parse_chain(AVFilterGraph *graph, const char *filters, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad); |
|
| 38 |
+int avfilter_parse_graph(AVFilterGraph *graph, const char *filters, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad); |
|
| 39 | 39 |
|
| 40 | 40 |
#endif /* FFMPEG_GRAPHPARSER_H */ |