Merge remote branch 'official/master'

author yukihane <yukihane.feather@gmail.com>

Mon, 12 Sep 2011 14:31:51 +0000 (23:31 +0900)

committer yukihane <yukihane.feather@gmail.com>

Mon, 12 Sep 2011 14:31:51 +0000 (23:31 +0900)
author yukihane <yukihane.feather@gmail.com>
Mon, 12 Sep 2011 14:31:51 +0000 (23:31 +0900)
committer yukihane <yukihane.feather@gmail.com>
Mon, 12 Sep 2011 14:31:51 +0000 (23:31 +0900)
diff --cc ffmpeg.c
Simple merge
diff --cc libavfilter/Makefile
Simple merge
diff --cc libavfilter/allfilters.c
Simple merge
author	yukihane <yukihane.feather@gmail.com>
	Mon, 12 Sep 2011 14:31:51 +0000 (23:31 +0900)
committer	yukihane <yukihane.feather@gmail.com>
	Mon, 12 Sep 2011 14:31:51 +0000 (23:31 +0900)
		1	2
ffmpeg.c	patch \|	diff1 \|	diff2 \|	blob \| history
libavfilter/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
libavfilter/allfilters.c	patch \|	diff1 \|	diff2 \|	blob \| history