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