Merge commit 'cc29d96d5a379dbcf2649947d884c202c2a52767'
[ffmpeg.git] / libswresample / swresample_frame.c
2014-08-16 Michael Niedermayerswresample: Add AVFrame based API