diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-24 10:57:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-24 10:57:04 +0200 |
| commit | af5f9c08763baff271401cf7f7478bae4d5db8dc (patch) | |
| tree | 1d62c75c69c64ce230b308073112c7beb4595b97 /libavcodec/version.h | |
| parent | 14a61bc3f9ad68151368bc3577bb26fe1146fbf4 (diff) | |
| parent | 95d52464542f532061290192518d5fe1c1930e8d (diff) | |
Merge commit '95d52464542f532061290192518d5fe1c1930e8d'
* commit '95d52464542f532061290192518d5fe1c1930e8d':
lavc: Add option to encode MPEG-2 AAC with libfdk-aac
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index c1941ab424..b59cdd2be8 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 16 +#define LIBAVCODEC_VERSION_MINOR 17 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |