Merge branch 'master' of git://git.ffmpeg.org/ffmpeg into lagarith-fixes
commitc94e15523ff980f915e91be2c78b394daaee4e62
authorNathan Caldwell <saintdev@gmail.com>
Sat, 8 Aug 2009 16:37:02 +0000 (8 10:37 -0600)
committerNathan Caldwell <saintdev@gmail.com>
Sat, 8 Aug 2009 16:37:02 +0000 (8 10:37 -0600)
tree22b5e269d3dd79bfef060785fee30eb2e164024f
parenta2999f3ab0404af1cb0a37a0a54dd4b029d83aa3
parent2b6ada08ebf67fddf1d7224e5f83d4b952bad116
Merge branch 'master' of git://git.ffmpeg.org/ffmpeg into lagarith-fixes
libavformat/riff.c