Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'

* commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c': Bump libavutil major version to account for the LLS API/ABI changes. Conflicts: libavutil/version.h Bump done to stay compatible with libav, its not neccessary otherwise for ffmpeg as we have the new ABI/API under LLS2 and the old (unused) under LLS

Michael Niedermayer committed 12 years ago

Commit 792845e2 parents 1d6666a 3bc2e893 files · +24 −24Browse files

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

Unified · Split

doc/APIchanges+1−1

@@ -10,7 +10,7 @@ libavresample: 2012-10-05 · 9 unmodified lines
10	libpostproc: 2011-04-18	10	libpostproc: 2011-04-18
11	libswresample: 2011-09-19	11	libswresample: 2011-09-19
12	libswscale: 2011-06-20	12	libswscale: 2011-06-20
13	libavutil: 2012-10-22	13	libavutil: 2013-12-xx
14		14
15		15
16	API changes, most recent first:	16	API changes, most recent first:

Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code