Revision 1e80a0ea

View differences:

doc/APIchanges
13 13

  
14 14
API changes, most recent first:
15 15

  
16
2010-11-07 - r25705 - lavfi 1.58.0 - avfiltergraph.h
17
  Remove graphparser.h header, move AVFilterInOut and
18
  avfilter_graph_parse() declarations to libavfilter/avfiltergraph.h.
19

  
16 20
2010-11-07 - r25700 - lavfi 1.57.0 - AVFilterInOut
17 21
  Rename field AVFilterInOut.filter to AVFilterInOut.filter_ctx.
18 22
  This change breaks libavfilter API.
ffmpeg.c
49 49
#if CONFIG_AVFILTER
50 50
# include "libavfilter/avfilter.h"
51 51
# include "libavfilter/avfiltergraph.h"
52
# include "libavfilter/graphparser.h"
53 52
# include "libavfilter/vsrc_buffer.h"
54 53
#endif
55 54

  
ffplay.c
41 41
#if CONFIG_AVFILTER
42 42
# include "libavfilter/avfilter.h"
43 43
# include "libavfilter/avfiltergraph.h"
44
# include "libavfilter/graphparser.h"
45 44
#endif
46 45

  
47 46
#include "cmdutils.h"
libavfilter/avfilter.h
25 25
#include "libavutil/avutil.h"
26 26

  
27 27
#define LIBAVFILTER_VERSION_MAJOR  1
28
#define LIBAVFILTER_VERSION_MINOR 57
28
#define LIBAVFILTER_VERSION_MINOR 58
29 29
#define LIBAVFILTER_VERSION_MICRO  0
30 30

  
31 31
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
libavfilter/avfiltergraph.h
87 87
 */
88 88
void avfilter_graph_free(AVFilterGraph *graph);
89 89

  
90
/**
91
 * A linked-list of the inputs/outputs of the filter chain.
92
 *
93
 * This is mainly useful for avfilter_graph_parse(), since this
94
 * function may accept a description of a graph with not connected
95
 * input/output pads. This struct specifies, per each not connected
96
 * pad contained in the graph, the filter context and the pad index
97
 * required for establishing a link.
98
 */
99
typedef struct AVFilterInOut {
100
    /** unique name for this input/output in the list */
101
    char *name;
102

  
103
    /** filter context associated to this input/output */
104
    AVFilterContext *filter_ctx;
105

  
106
    /** index of the filt_ctx pad to use for linking */
107
    int pad_idx;
108

  
109
    /** next input/input in the list, NULL if this is the last */
110
    struct AVFilterInOut *next;
111
} AVFilterInOut;
112

  
113
/**
114
 * Add a graph described by a string to a graph.
115
 *
116
 * @param graph   the filter graph where to link the parsed graph context
117
 * @param filters string to be parsed
118
 * @param inputs  linked list to the inputs of the graph
119
 * @param outputs linked list to the outputs of the graph
120
 * @return zero on success, a negative AVERROR code on error
121
 */
122
int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
123
                         AVFilterInOut *inputs, AVFilterInOut *outputs,
124
                         AVClass *log_ctx);
125

  
90 126
#endif  /* AVFILTER_AVFILTERGRAPH_H */
libavfilter/graphparser.c
24 24
#include <string.h>
25 25

  
26 26
#include "libavutil/avstring.h"
27
#include "graphparser.h"
28 27
#include "avfilter.h"
29 28
#include "avfiltergraph.h"
30 29
#include "parseutils.h"
libavfilter/graphparser.h
1
/*
2
 * Filter graph parser
3
 * copyright (c) 2007 Bobby Bingham
4
 *
5
 * This file is part of FFmpeg.
6
 *
7
 * FFmpeg is free software; you can redistribute it and/or
8
 * modify it under the terms of the GNU Lesser General Public
9
 * License as published by the Free Software Foundation; either
10
 * version 2.1 of the License, or (at your option) any later version.
11
 *
12
 * FFmpeg is distributed in the hope that it will be useful,
13
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
15
 * Lesser General Public License for more details.
16
 *
17
 * You should have received a copy of the GNU Lesser General Public
18
 * License along with FFmpeg; if not, write to the Free Software
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
 */
21

  
22
#ifndef AVFILTER_GRAPHPARSER_H
23
#define AVFILTER_GRAPHPARSER_H
24

  
25
#include "avfilter.h"
26
#include "avfiltergraph.h"
27

  
28
/**
29
 * A linked-list of the inputs/outputs of the filter chain.
30
 *
31
 * This is mainly useful for avfilter_graph_parse(), since this
32
 * function may accept a description of a graph with not connected
33
 * input/output pads. This struct specifies, per each not connected
34
 * pad contained in the graph, the filter context and the pad index
35
 * required for establishing a link.
36
 */
37
typedef struct AVFilterInOut {
38
    /** unique name for this input/output in the list */
39
    char *name;
40

  
41
    /** filter context associated to this input/output */
42
    AVFilterContext *filter_ctx;
43

  
44
    /** index of the filt_ctx pad to use for linking */
45
    int pad_idx;
46

  
47
    /** next input/input in the list, NULL if this is the last */
48
    struct AVFilterInOut *next;
49
} AVFilterInOut;
50

  
51
/**
52
 * Add a graph described by a string to a graph.
53
 *
54
 * @param graph   the filter graph where to link the parsed graph context
55
 * @param filters string to be parsed
56
 * @param inputs  linked list to the inputs of the graph
57
 * @param outputs linked list to the outputs of the graph
58
 * @return zero on success, a negative AVERROR code on error
59
 */
60
int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
61
                         AVFilterInOut *inputs, AVFilterInOut *outputs,
62
                         AVClass *log_ctx);
63

  
64
#endif  /* AVFILTER_GRAPHPARSER_H */
tools/graph2dot.c
22 22

  
23 23
#undef HAVE_AV_CONFIG_H
24 24
#include "libavutil/pixdesc.h"
25
#include "libavfilter/graphparser.h"
25
#include "libavfilter/avfiltergraph.h"
26 26

  
27 27
static void usage(void)
28 28
{

Also available in: Unified diff