wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '38f0c0781a'

Browse source 
* commit '38f0c0781a':
  lavfi: merge avfiltergraph.h into avfilter.h

Conflicts:
	doc/APIchanges
	ffmpeg_filter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.h
	libavfilter/version.h
	tools/graph2dot.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-11 23:40:41 +02:00
commit 231fd4411f
13 changed files with 259 additions and 263 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libavfilter/graphparser.c
View file

@ -26,7 +26,6 @@
#include "libavutil/avstring.h"
#include "libavutil/mem.h"
#include "avfilter.h"
#include "avfiltergraph.h"
#define WHITESPACES " \n\t"