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