OSDN Git Service

Merge remote branch 'official/master'
authoryukihane <yukihane.feather@gmail.com>
Mon, 12 Sep 2011 14:31:51 +0000 (23:31 +0900)
committeryukihane <yukihane.feather@gmail.com>
Mon, 12 Sep 2011 14:31:51 +0000 (23:31 +0900)
commit41012afa8f55cc9714157b904decf317545f84b8
tree8b5b2190f30849b072f5e4f213956e9c3ced7d96
parentcde8c0d7a9f4c66d128051f39b54358ca6a565c1
parent57650c70e22b8259f4ac65d5826a667c8f67726e
Merge remote branch 'official/master'
ffmpeg.c
libavfilter/Makefile
libavfilter/allfilters.c