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