diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 00:44:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 00:44:28 +0200 |
| commit | 8985e7c56130b42f6184b064b7141e365f59356b (patch) | |
| tree | a957787aa28a0bb5d1a9012daf2ece37edcfb3f7 /libavformat/version.h | |
| parent | 7856afef524da4eb93e1c823f9cdcd6a2badb3fe (diff) | |
| parent | 9b56ac74b170d12027fbc81f581a451a709f1105 (diff) | |
| download | ffmpeg-8985e7c56130b42f6184b064b7141e365f59356b.tar.gz | |
Merge commit '9b56ac74b170d12027fbc81f581a451a709f1105'
* commit '9b56ac74b170d12027fbc81f581a451a709f1105':
mpjpeg: Initial implementation
Conflicts:
Changelog
libavformat/allformats.c
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 625025e657..67862b7890 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 34 +#define LIBAVFORMAT_VERSION_MINOR 35 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |