Merge commit 'b2b79eca6fae2466a53c5daa163a37e2474364fc'
[ffmpeg.git] / libavresample / libavresample.v
2012-04-25 Michael NiedermayerMerge remote-tracking branch 'qatar/master'
2012-04-25 Justin RugglesAdd libavresample