aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/version.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-28 17:24:48 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-28 23:54:51 +0100
commit1c13e1ef368ae6b6c7582f39e2e9567df8f200db (patch)
treee34b91306676d78a6c48ac47128302523ae4676a /libavformat/version.h
parent075d6c066bc982819019b7c39660e8f3c9dfecc6 (diff)
downloadffmpeg-1c13e1ef368ae6b6c7582f39e2e9567df8f200db.tar.gz
avformat/img2dec: Use avformat probing interface to identify format if it has not been otherwise identified
This is used only for distinguishing .pix formats for now. Which is the only case that has image2 demuxers currently Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
-rw-r--r--libavformat/version.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/version.h b/libavformat/version.h
index 55b8591457..cb17faee16 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 35
-#define LIBAVFORMAT_VERSION_MICRO 102
+#define LIBAVFORMAT_VERSION_MINOR 36
+#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \