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