diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 02:21:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-31 02:23:26 +0200 |
| commit | 75621cdf5d7e2ca7f6af5fbabd3ce2ed81d6cb12 (patch) | |
| tree | b92f4309b06f20e75e6cf741ea2f35b5f51bd6c9 | |
| parent | e4fc7e3d4de96ba16582d2500f377ecdece28401 (diff) | |
| parent | 09fda6bb503dd9ac6ca963e308bdb86114df1294 (diff) | |
| download | ffmpeg-75621cdf5d7e2ca7f6af5fbabd3ce2ed81d6cb12.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libmp3lame: add ABR support
Conflicts:
libavcodec/libmp3lame.c
libavcodec/version.h
See: d3211cfaedcc0abf30e3a40c246237090ad95b6d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 2c1d5178be..c4e33a9698 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 55 -#define LIBAVCODEC_VERSION_MICRO 105 +#define LIBAVCODEC_VERSION_MICRO 106 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |