diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 15:46:38 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 15:46:38 +0400 |
| commit | 03bb99ae1a99fa315621308b885a8fc70702c9bc (patch) | |
| tree | d21c922164f5f18348a3e5f060a7ad9b42de8999 /libavcodec/version.h | |
| parent | 0ccfcb0638be99d1fc2c2c1dea6850b3b257ae01 (diff) | |
| parent | 0957b274e312e985d69cb490bee2a7ff820acaa6 (diff) | |
Merge commit '0957b274e312e985d69cb490bee2a7ff820acaa6'
* commit '0957b274e312e985d69cb490bee2a7ff820acaa6':
lavc: add an option to enable side data-only packets during encoding
Conflicts:
libavcodec/avcodec.h
libavcodec/options_table.h
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 4454bf1cde..d16e140271 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 65 +#define LIBAVCODEC_VERSION_MINOR 66 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |