diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 13:41:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 13:41:49 +0100 |
| commit | 595ba3b96258538566d6f42113dd0180aaee87c4 (patch) | |
| tree | d589db49525821e4a074efeb985dd8a3e6c59c3b /libavformat/version.h | |
| parent | bd34e26b27e9ec83727dedd1c04c40d8a245cfa8 (diff) | |
| parent | 25b32586566f285d797737863c97a1c5c9c84e2b (diff) | |
Merge commit '25b32586566f285d797737863c97a1c5c9c84e2b'
* commit '25b32586566f285d797737863c97a1c5c9c84e2b':
lavf: add an AVStream field for exporting stream-global side data
Conflicts:
libavformat/utils.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
| -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 e0d3fc8ba8..962f5a8ab0 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,8 +30,8 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 55 -#define LIBAVFORMAT_VERSION_MINOR 34 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MINOR 35 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |