OSDN Git Service

Merge branch 'master' of git://git.videolan.org/ffmpeg
authoryukihane <yukihane.feather@gmail.com>
Mon, 1 Aug 2011 14:03:44 +0000 (23:03 +0900)
committeryukihane <yukihane.feather@gmail.com>
Mon, 1 Aug 2011 14:03:44 +0000 (23:03 +0900)
commitbea3d7a44fa6c9560f43550ad52da475226c76af
tree522a69c84e746f40899b0a842af4fced537d17db
parent805913f4441ccb371072238d78aaaa6d50ac296a
parent29d854d6c5b31f816b639eac231ce86afa42b11d
Merge branch 'master' of git://git.videolan.org/ffmpeg

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