Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'

* commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45': avresample: Introduce AVFrame-based API Conflicts: libavresample/utils.c libavutil/version.h

Michael Niedermayer committed 12 years ago

Commit 78eaaa82 parents 0d0d24a fb1ddcd6 files · +209 −2Browse files

Showing the changes to doc/APIchanges (1 of 6 files). Show all

Unified · Split

@@ -15,6 +15,12 @@ libavutil: 2014-08-09 · 14 unmodified lines
15	15
16	16	API changes, most recent first:
17	17
	18	+2014-04-xx - xxxxxxx - lavr 2.1.0 - avresample.h
	19	+ Add avresample_convert_frame() and avresample_config().
	20	+
	21	+2014-04-xx - xxxxxxx - lavu 54.1.0 - error.h
	22	+ Add AVERROR_INPUT_CHANGED and AVERROR_OUTPUT_CHANGED.
	23	+
18	24	2014-08-xx - xxxxxxx - lavc 55.57.4 - avcodec.h
19	25	Deprecate FF_IDCT_XVIDMMX define and xvidmmx idct option.
20	26	Replaced by FF_IDCT_XVID and xvid respectively.

Keyboard shortcuts