aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2011-02-06 09:19:34 -0500
committerMichael Niedermayer <michaelni@gmx.at>2011-02-06 20:31:47 +0100
commit340a20ea650523358322072677ea734e3d502d59 (patch)
tree5fa1196cbb18d50907b959d404e6fd6dc50f4730
parentfbdcdaee6e458103bbb2e489b62fa5670ffa4b24 (diff)
downloadffmpeg-340a20ea650523358322072677ea734e3d502d59.tar.gz
Update MINOR and set git rev for non-blocking flag API addition.
(cherry picked from commit efdd67cb00ad770c16c47161c023121e1ae53ae9)
-rw-r--r--doc/APIchanges2
-rw-r--r--libavformat/version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/APIchanges b/doc/APIchanges
index 5edd52d18b..5c15ae9229 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,7 +13,7 @@ libavutil: 2009-03-08
API changes, most recent first:
-2011-02-XX - XXXXXXX - lavf 52.XX.0 - avio.h
+2011-02-XX - fe174fc - lavf 52.97.0 - avio.h
Add flag for non-blocking protocols: URL_FLAG_NONBLOCK
2011-02-04 - f124b08 - lavf 52.96.0 - avformat_free_context()
diff --git a/libavformat/version.h b/libavformat/version.h
index 27f52e06e1..603d7cfa3a 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -24,7 +24,7 @@
#include "libavutil/avutil.h"
#define LIBAVFORMAT_VERSION_MAJOR 52
-#define LIBAVFORMAT_VERSION_MINOR 96
+#define LIBAVFORMAT_VERSION_MINOR 97
#define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \