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