Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 16:20:37 +0000 (18:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 16:20:37 +0000 (18:20 +0200)
commit78eaaa857e95fa5542dc008c8ad3664e6ab6801a
tree41bed9cbaefc6147bd6acbb8018e9e1dd33544ca
parent0d0d24af0159ff08f396ad04cd63ce5655b1fc60
parentfb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45
Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'

* commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45':
  avresample: Introduce AVFrame-based API

Conflicts:
libavresample/utils.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavresample/avresample.h
libavresample/utils.c
libavresample/version.h
libavutil/error.h
libavutil/version.h