From 574b183d64e61d299956e76e27db57a7743ee77c Mon Sep 17 00:00:00 2001
From: Peter Ross <pross@xvid.org>
Date: Thu, 14 Jan 2010 14:02:06 +0000
Subject: [PATCH] Latent libavformat version bump and documentation update for
Adobe Filmstrip muxer and demuxer (r21212)
Originally committed as revision 21213 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
doc/general.texi | 1 +
libavformat/avformat.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/doc/general.texi b/doc/general.texi
index 92a11b830ba..8e2296937c8 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -44,6 +44,7 @@ library:
@item 4xm @tab @tab X
@tab 4X Technologies format, used in some games.
@item 8088flex TMV @tab @tab X
+@item Adobe Filmstrip @tab X @tab X
@item Audio IFF (AIFF) @tab X @tab X
@item American Laser Games MM @tab @tab X
@tab Multimedia format used in games like Mad Dog McCree.
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 53f93ef961c..e4dba364a86 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -22,7 +22,7 @@
#define AVFORMAT_AVFORMAT_H
#define LIBAVFORMAT_VERSION_MAJOR 52
-#define LIBAVFORMAT_VERSION_MINOR 46
+#define LIBAVFORMAT_VERSION_MINOR 47
#define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
--
GitLab