diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 20:43:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 20:43:11 +0200 |
| commit | a561662fb7223cb98907744e03398848a0d362e1 (patch) | |
| tree | 23720ae7eb8ba20c8bc6c2db995b977d93433115 /libavcodec/version.h | |
| parent | 2bf87dcc2d3079ead09b250df6932c94ff13504c (diff) | |
| parent | ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d (diff) | |
| download | ffmpeg-a561662fb7223cb98907744e03398848a0d362e1.tar.gz | |
Merge commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d'
* commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d':
avcodec: Undeprecate reordered_opaque
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 97d5074faa..a44826bb03 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 73 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |