diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 11:45:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 12:05:19 +0200 |
| commit | 614cf1a6133a143961798c5d87c9bffc2ca0da9e (patch) | |
| tree | bd72a843fa20e50578e1c8a8231262150136b322 /libavcodec/version.h | |
| parent | b69b075ac607419a840da798b089de8ea7630d4b (diff) | |
| parent | 4f2b469da5e4ae221718ae479f6af627cfdebb91 (diff) | |
| download | ffmpeg-614cf1a6133a143961798c5d87c9bffc2ca0da9e.tar.gz | |
Merge commit '4f2b469da5e4ae221718ae479f6af627cfdebb91'
* commit '4f2b469da5e4ae221718ae479f6af627cfdebb91':
Add a libfdk-aac decoder
Conflicts:
configure
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 553f5f21ec..7d01933ed0 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 28 +#define LIBAVCODEC_VERSION_MINOR 29 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |