diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 00:20:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 00:20:48 +0200 |
| commit | d858ee717bed6307b8e772bd5039ab001aeae03f (patch) | |
| tree | 2e8d510d7c759cf58cb178c55409340bab048161 /libavformat/version.h | |
| parent | b50559fc0b2bb4c1ac85aad2e9b0122fe4ec53a3 (diff) | |
| parent | 6d212599aa684f30511fb08ca30fe2378405304e (diff) | |
Merge commit '6d212599aa684f30511fb08ca30fe2378405304e'
* commit '6d212599aa684f30511fb08ca30fe2378405304e':
avformat: Provide a standard compliance flag
Conflicts:
doc/APIchanges
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 84d49103cb..6f7aa7d31e 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 55 -#define LIBAVFORMAT_VERSION_MINOR 41 +#define LIBAVFORMAT_VERSION_MINOR 42 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |