eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-16 04:32:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'

Browse Source 
* 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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-12-16 21:36:14 +01:00
parent 1d6666a6b8 3bc2e89c76
commit 792845e436
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/APIchanges
+1 -1
View File
@@ -10,7 +10,7 @@ libavresample: 2012-10-05
libpostproc: 2011-04-18
libswresample: 2011-09-19
libswscale: 2011-06-20
libavutil: 2012-10-22
libavutil: 2013-12-xx
API changes, most recent first: