Merge branch 'eldruin_ffmpeg2'
authorCarlos Lopez <genetita@gmail.com>
Fri, 12 Mar 2010 17:07:14 +0000 (18:07 +0100)
committerCarlos Lopez <genetita@gmail.com>
Fri, 12 Mar 2010 17:07:14 +0000 (18:07 +0100)
commitd142890f6a23f6736747978763468faa7581aab0
tree2a7ed858cde668e39c2669e7aade68d0019e9337
parentc554611b986abfe0733b63260b19d99d3384edf0
parent4636856215d403cc5cc0e62dd609f21f7568339c
Merge branch 'eldruin_ffmpeg2'