OSDN Git Service

Merge remote branch 'official/master'
authoryukihane <yukihane.feather@gmail.com>
Mon, 12 Sep 2011 10:44:41 +0000 (19:44 +0900)
committeryukihane <yukihane.feather@gmail.com>
Mon, 12 Sep 2011 10:44:41 +0000 (19:44 +0900)
commitedb141638cd470c9423a4349a6cfc20e1f3cc867
treefa965892f4287f1b28a3d8f8cb89d0855a2bf77c
parent0a47b69a25edfa484ce23cb6ebed61d23f3a45e5
parent83a0caad8468c3079aeeb9f6307d7ba9019ba1d1
Merge remote branch 'official/master'

Conflicts:
ffmpeg.c
ffmpeg.c
libavfilter/Makefile
libavfilter/allfilters.c