diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 02:44:22 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 02:44:22 +0100 |
commit | 1667152a9c1af2ca978f005bb095e479ef7a3107 (patch) | |
tree | cca08cf9c559a88bc6672b16a6889ca294482e68 /libavcodec | |
parent | ba4bcb191aa8b5fa66131544bf9ebf1f17ff7d9a (diff) | |
parent | acb571c89a065d943163c11efb46de35774f1909 (diff) |
Merge commit 'acb571c89a065d943163c11efb46de35774f1909'
* commit 'acb571c89a065d943163c11efb46de35774f1909':
avcodec: bump minor for adaptive h264 frame-mt
avconv: pass the actually selected decoder to filter_codec_opts().
Conflicts:
Changelog
ffmpeg_opt.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-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 f980fed78f..74c8360011 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 54 -#define LIBAVCODEC_VERSION_MINOR 80 +#define LIBAVCODEC_VERSION_MINOR 81 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |