Merge commit '1985c2e75c
'
* commit '1985c2e75c
':
Bump major versions of all libraries.
Conflicts:
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h
libavutil/version.h
libswscale/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
a57ece0cb4
8 changed files with 25 additions and 26 deletions
|
@ -27,9 +27,9 @@
|
|||
|
||||
#include "libavutil/version.h"
|
||||
|
||||
#define LIBAVDEVICE_VERSION_MAJOR 55
|
||||
#define LIBAVDEVICE_VERSION_MINOR 13
|
||||
#define LIBAVDEVICE_VERSION_MICRO 102
|
||||
#define LIBAVDEVICE_VERSION_MAJOR 56
|
||||
#define LIBAVDEVICE_VERSION_MINOR 0
|
||||
#define LIBAVDEVICE_VERSION_MICRO 100
|
||||
|
||||
#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
|
||||
LIBAVDEVICE_VERSION_MINOR, \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue