Merge branch 'master' of git://git.videolan.org/ffmpeg
authorMichael Bradshaw <mbradshaw@sorensonmedia.com>
Fri, 18 Nov 2011 15:28:03 +0000 (08:28 -0700)
committerMichael Bradshaw <mbradshaw@sorensonmedia.com>
Fri, 18 Nov 2011 15:28:03 +0000 (08:28 -0700)
commit99252726e8a95bc457033de208dd9d0d56103e62
tree45d6a0bb9cb7c8cb6bb51edfe639bd627fd4349d
parent7c92c03b8d0aec2b593ade85525c7a8f87fecc63
parentfd1cea6549c29c557b22021451ef6d0fe6ef2123
Merge branch 'master' of git://git.videolan.org/ffmpeg