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