diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 02:01:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 02:01:13 +0100 |
| commit | 6a24d77929e0d5425c79a081034719ac68199602 (patch) | |
| tree | 5300b75b67ae1494e494333730e4234a16562839 /libavutil/version.h | |
| parent | f4c8d002231afbc181e97c512e459ec6860f7098 (diff) | |
| parent | c3ecd968f0e78da6e77f0c06c2f785b266d83cf1 (diff) | |
| download | ffmpeg-6a24d77929e0d5425c79a081034719ac68199602.tar.gz | |
Merge commit 'c3ecd968f0e78da6e77f0c06c2f785b266d83cf1'
* commit 'c3ecd968f0e78da6e77f0c06c2f785b266d83cf1':
AVOptions: add flags for read/read-only options
Conflicts:
libavutil/opt.c
libavutil/opt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
| -rw-r--r-- | libavutil/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index 3d2509719c..e3b822c01f 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,8 +56,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 64 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 65 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |