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