diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 17:41:27 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 17:41:27 +0000 |
| commit | fe20e34b139fde727d23c7f50c310e11567bcc5f (patch) | |
| tree | 0bdca4ece274a425c0df95e1ed0b138a94dd8f96 /libavcodec/version.h | |
| parent | ad317c94c5fad00f97881263647e316344f0a81e (diff) | |
| parent | 79ae1e630b476889c251fc905687a3831b43ab5e (diff) | |
| download | ffmpeg-streaming-fe20e34b139fde727d23c7f50c310e11567bcc5f.zip ffmpeg-streaming-fe20e34b139fde727d23c7f50c310e11567bcc5f.tar.gz | |
Merge commit '79ae1e630b476889c251fc905687a3831b43ab5e'
* commit '79ae1e630b476889c251fc905687a3831b43ab5e':
avcodec: Define side data type for fallback track
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
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 1e21f15..5eecf5b 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 15 +#define LIBAVCODEC_VERSION_MINOR 16 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |
