~ubuntu-branches/ubuntu/lucid/ffmpeg/lucid-security

« back to all changes in this revision

Viewing changes to libavfilter/graphparser.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-03-13 09:18:28 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090313091828-n4ktby5eca487uhv
Tags: 3:0.svn20090303-1ubuntu1+unstripped1
merge from ubuntu.jaunty branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
329
329
    return pad;
330
330
}
331
331
 
332
 
int avfilter_parse_graph(AVFilterGraph *graph, const char *filters,
 
332
int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
333
333
                         AVFilterInOut *open_inputs,
334
334
                         AVFilterInOut *open_outputs, AVClass *log_ctx)
335
335
{
376
376
        index++;
377
377
    } while(chr == ',' || chr == ';');
378
378
 
379
 
    if (*filters) {
 
379
    if (chr) {
380
380
        av_log(log_ctx, AV_LOG_ERROR,
381
381
               "Unable to parse graph description substring: \"%s\"\n",
382
382
               filters - 1);
394
394
    return 0;
395
395
 
396
396
 fail:
397
 
    avfilter_destroy_graph(graph);
 
397
    avfilter_graph_destroy(graph);
398
398
    free_inout(open_inputs);
399
399
    free_inout(open_outputs);
400
400
    free_inout(curr_inputs);