Merge commit '111367263af41c88a44bd763ceefc11d53a7f655'

* commit '111367263af41c88a44bd763ceefc11d53a7f655': lavfi: add AVFilterContext.graph. Conflicts: libavfilter/avfilter.h

Michael Niedermayer committed 13 years ago

Commit 4fde7052 parents 5c68e14 11136723 files · +8 −0Browse files

Showing the changes to libavfilter/avfilter.h (1 of 3 files). Show all

Unified · Split

@@ -527,6 +527,8 @@ struct AVFilterContext { · 526 unmodified lines
527		527
528	void *priv; ///< private data for use by the filter	528	void *priv; ///< private data for use by the filter
529		529
		530	struct AVFilterGraph *graph; ///< filtergraph this filter belongs to
		531
530	struct AVFilterCommand *command_queue;	532	struct AVFilterCommand *command_queue;
531	};	533	};
532		534

Keyboard shortcuts