diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 21:45:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 21:45:41 +0200 |
| commit | 9da679e77fa25487ae37db11f010fde68034e362 (patch) | |
| tree | 67ea58cbab5418d1c6de6c3cc62d7c0024a0be80 | |
| parent | 911ba8fb197dee6fb1dd4ac2d1fa2d8541ab6ab5 (diff) | |
| parent | 7ae9791b641d1183910b6e7faca23f7ae08f8579 (diff) | |
| download | ffmpeg-9da679e77fa25487ae37db11f010fde68034e362.tar.gz | |
Merge commit '7ae9791b641d1183910b6e7faca23f7ae08f8579'
* commit '7ae9791b641d1183910b6e7faca23f7ae08f8579':
avformat: bump version after mime_type change
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index 486979f199..569681cebf 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,8 +30,8 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 56 -#define LIBAVFORMAT_VERSION_MINOR 7 -#define LIBAVFORMAT_VERSION_MICRO 104 +#define LIBAVFORMAT_VERSION_MINOR 8 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |