diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 13:00:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 13:00:46 +0100 |
| commit | 625b29037e52bf46c15a7a1fccc83f6ef1647225 (patch) | |
| tree | 3e492b6020a30f0c2f77aa548663de2000cb19e0 /libavutil/version.h | |
| parent | cd51d9a98403a97c0ec1a2a57337193d489a5096 (diff) | |
| parent | 1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025 (diff) | |
Merge commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025'
* commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025':
mpeg12dec: Extract CC user data into frame side data
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
| -rw-r--r-- | libavutil/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index c01da935b8..e9e80032dc 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,7 +75,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 54 +#define LIBAVUTIL_VERSION_MINOR 55 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |