summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2009-03-01 14:50:03 +0000
committerAurelien Jacobs <aurel@gnuage.org>2009-03-01 14:50:03 +0000
commitec26457064142f132edf631fc9dedccde59bec48 (patch)
tree72063553f785e6661a9148d252739fe8ad854488
parent95030323d1e287abb9b90959fa5111a0aa0f55e2 (diff)
new metadata API is now officially part of public API
Originally committed as revision 17682 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Changelog1
-rw-r--r--libavformat/avformat.h5
2 files changed, 3 insertions, 3 deletions
diff --git a/Changelog b/Changelog
index 58ebffcc29..7bfee837dc 100644
--- a/Changelog
+++ b/Changelog
@@ -151,6 +151,7 @@ version <next>
- NC (NC4600) cameras file demuxer
- Gopher client support
- MXF D-10 muxer
+- Generic metadata API
version 0.4.9-pre1:
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index d1d6d02b2f..df532519a3 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -22,8 +22,8 @@
#define AVFORMAT_AVFORMAT_H
#define LIBAVFORMAT_VERSION_MAJOR 52
-#define LIBAVFORMAT_VERSION_MINOR 30
-#define LIBAVFORMAT_VERSION_MICRO 1
+#define LIBAVFORMAT_VERSION_MINOR 31
+#define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
@@ -51,7 +51,6 @@ struct AVFormatContext;
/*
* Public Metadata API.
- * !!WARNING!! This is a work in progress. Don't use outside FFmpeg for now.
* The metadata API allows libavformat to export metadata tags to a client
* application using a sequence of key/value pairs.
* Important concepts to keep in mind: