Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-10 18:20:37 +02:00
6 changed files with 209 additions and 2 deletions

View File

@@ -15,6 +15,12 @@ libavutil: 2014-08-09
API changes, most recent first:
2014-04-xx - xxxxxxx - lavr 2.1.0 - avresample.h
Add avresample_convert_frame() and avresample_config().
2014-04-xx - xxxxxxx - lavu 54.1.0 - error.h
Add AVERROR_INPUT_CHANGED and AVERROR_OUTPUT_CHANGED.
2014-08-xx - xxxxxxx - lavc 55.57.4 - avcodec.h
Deprecate FF_IDCT_XVIDMMX define and xvidmmx idct option.
Replaced by FF_IDCT_XVID and xvid respectively.