* qatar/master: vsrc_buffer: fix check from 7ae7c41. libxvid: Reorder functions to avoid forward declarations; make functions static. libxvid: drop some pointless dead code wmal: vertical alignment cosmetics wmal: Warn about missing bitstream splicing feature and ask for sample. wmal: Skip seekable_frame_in_packet. wmal: Drop unused variable num_possible_block_size. avfiltergraph: make the AVFilterInOut alloc/free API public graphparser: allow specifying sws flags in the graph description. graphparser: fix the order of connecting unlabeled links. graphparser: add avfilter_graph_parse2(). vsrc_buffer: allow using a NULL buffer to signal EOF. swscale: handle last pixel if lines have an odd width. qdm2: fix a dubious pointer cast WMAL: Do not try to read rawpcm coefficients if bits is invalid mov: Fix detecting there is no sync sample. tiffdec: K&R cosmetics avf: has_duration does not check the global one dsputil: fix optimized emu_edge function on Win64. Conflicts: doc/APIchanges libavcodec/libxvid_rc.c libavcodec/libxvidff.c libavcodec/tiff.c libavcodec/wmalosslessdec.c libavfilter/avfiltergraph.h libavfilter/graphparser.c libavfilter/version.h libavfilter/vsrc_buffer.c libswscale/output.c
Showing the changes to libavfilter/avfiltergraph.h (1 of 18 files). Show all
Unified · Split
| @@ -91,11 +91,11 @@ void avfilter_graph_free(AVFilterGraph **graph); · 90 unmodified lines | ||
| 91 | 91 | /** |
| 92 | 92 | * A linked-list of the inputs/outputs of the filter chain. |
| 93 | 93 | * |
| 94 | − * This is mainly useful for avfilter_graph_parse(), since this | |
| 95 | − * function may accept a description of a graph with not connected | |
| 96 | − * input/output pads. This struct specifies, per each not connected | |
| 97 | − * pad contained in the graph, the filter context and the pad index | |
| 98 | − * required for establishing a link. | |
| 94 | + * This is mainly useful for avfilter_graph_parse() / avfilter_graph_parse2(), | |
| 95 | + * where it is used to communicate open (unlinked) inputs and outputs from and | |
| 96 | + * to the caller. | |
| 97 | + * This struct specifies, per each not connected pad contained in the graph, the | |
| 98 | + * filter context and the pad index required for establishing a link. | |
| 99 | 99 | */ |
| 100 | 100 | typedef struct AVFilterInOut { |
| 101 | 101 | /** unique name for this input/output in the list */ |
| @@ -112,13 +112,14 @@ typedef struct AVFilterInOut { · 10 unmodified lines | ||
| 112 | 112 | } AVFilterInOut; |
| 113 | 113 | |
| 114 | 114 | /** |
| 115 | − * Create an AVFilterInOut. | |
| 116 | − * Must be free with avfilter_inout_free(). | |
| 115 | + * Allocate a single AVFilterInOut entry. | |
| 116 | + * Must be freed with avfilter_inout_free(). | |
| 117 | + * @return allocated AVFilterInOut on success, NULL on failure. | |
| 117 | 118 | */ |
| 118 | 119 | AVFilterInOut *avfilter_inout_alloc(void); |
| 119 | 120 | |
| 120 | 121 | /** |
| 121 | − * Free the AVFilterInOut in *inout, and set its pointer to NULL. | |
| 122 | + * Free the supplied list of AVFilterInOut and set *inout to NULL. | |
| 122 | 123 | * If *inout is NULL, do nothing. |
| 123 | 124 | */ |
| 124 | 125 | void avfilter_inout_free(AVFilterInOut **inout); |
| @@ -140,6 +141,41 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, · 15 unmodified lines | ||
| 140 | 141 | AVFilterInOut **inputs, AVFilterInOut **outputs, |
| 141 | 142 | void *log_ctx); |
| 142 | 143 | |
| 144 | +/** | |
| 145 | + * Add a graph described by a string to a graph. | |
| 146 | + * | |
| 147 | + * @param[in] graph the filter graph where to link the parsed graph context | |
| 148 | + * @param[in] filters string to be parsed | |
| 149 | + * @param[out] inputs a linked list of all free (unlinked) inputs of the | |
| 150 | + * parsed graph will be returned here. It is to be freed | |
| 151 | + * by the caller using avfilter_inout_free(). | |
| 152 | + * @param[out] outputs a linked list of all free (unlinked) outputs of the | |
| 153 | + * parsed graph will be returned here. It is to be freed by the | |
| 154 | + * caller using avfilter_inout_free(). | |
| 155 | + * @return zero on success, a negative AVERROR code on error | |
| 156 | + * | |
| 157 | + * @note the difference between avfilter_graph_parse2() and | |
| 158 | + * avfilter_graph_parse() is that in avfilter_graph_parse(), the caller provides | |
| 159 | + * the lists of inputs and outputs, which therefore must be known before calling | |
| 160 | + * the function. On the other hand, avfilter_graph_parse2() \em returns the | |
| 161 | + * inputs and outputs that are left unlinked after parsing the graph and the | |
| 162 | + * caller then deals with them. Another difference is that in | |
| 163 | + * avfilter_graph_parse(), the inputs parameter describes inputs of the | |
| 164 | + * <em>already existing</em> part of the graph; i.e. from the point of view of | |
| 165 | + * the newly created part, they are outputs. Similarly the outputs parameter | |
| 166 | + * describes outputs of the already existing filters, which are provided as | |
| 167 | + * inputs to the parsed filters. | |
| 168 | + * avfilter_graph_parse2() takes the opposite approach -- it makes no reference | |
| 169 | + * whatsoever to already existing parts of the graph and the inputs parameter | |
| 170 | + * will on return contain inputs of the newly parsed part of the graph. | |
| 171 | + * Analogously the outputs parameter will contain outputs of the newly created | |
| 172 | + * filters. | |
| 173 | + */ | |
| 174 | +int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters, | |
| 175 | + AVFilterInOut **inputs, | |
| 176 | + AVFilterInOut **outputs); | |
| 177 | + | |
| 178 | + | |
| 143 | 179 | /** |
| 144 | 180 | * Send a command to one or more filter instances. |
| 145 | 181 | * |