diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-13 22:22:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-13 22:22:52 +0200 |
| commit | ed8e6d535cf4c56d82f9c91646dfc42787b719d6 (patch) | |
| tree | e7b1317c403a147ff633193417164e80d56f269e /libavformat/version.h | |
| parent | ec14f53dbd02d4bbe12d8895370170804ab40779 (diff) | |
| parent | afbd4b7e093adf6d7a830b32759ca3ba8500363d (diff) | |
| download | ffmpeg-ed8e6d535cf4c56d82f9c91646dfc42787b719d6.tar.gz | |
Merge commit 'afbd4b7e093adf6d7a830b32759ca3ba8500363d'
* commit 'afbd4b7e093adf6d7a830b32759ca3ba8500363d':
lavf: add AVFormatContext/AVStream fields for signaling to the user when events happen.
Conflicts:
libavformat/avformat.h
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
| -rw-r--r-- | libavformat/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index 1cbb889707..c09bd88303 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 56 -#define LIBAVFORMAT_VERSION_MINOR 0 +#define LIBAVFORMAT_VERSION_MINOR 1 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |