Revert previous commit that contained an unrelated hunk.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@8137 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavutil/Makefile b/libavutil/Makefile
index e7658f0916edd18d798eb2a68d6e5df7f9525374..8155d5acb054a1ec9438d0df437dd982213ac7a6 100644 (file)
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -24,7 +24,9 @@ HEADERS = avutil.h common.h mathematics.h integer.h rational.h \
           random.h
 
 NAME=avutil
+ifeq ($(BUILD_SHARED),yes)
 LIBVERSION=$(LAVUVERSION)
 LIBMAJOR=$(LAVUMAJOR)
+endif
 
 include ../common.mak

diff --git a/libavutil/tree.h b/libavutil/tree.h
index b23051c9cecdbd520fb64df1f5149d34a373657e..36897ef46ebef59f75523107578586c12483472f 100644 (file)
--- a/libavutil/tree.h
+++ b/libavutil/tree.h
@@ -41,10 +41,10 @@ void *av_tree_find(const struct AVTreeNode *root, void *key, int (*cmp)(void *ke
  *              root node can change during insertions, this is required to
  *              keep the tree balanced
  *
- * @return If no insertion happened, the found element.
- *         If an insertion happened, then either key or NULL is returned (which one
- *         it is depends on the tree state and the implementation, you should make
- *         no assumptions that it's one or the other in the code).
+ * @return if no insertion happened, the found element
+ *         if a insertion happened, then either key or NULL is returned (which it is
+ *         depends on the tree state and the implemenattion, you should make no
+ *         asumtations that its one or the other in code)
  */
 void *av_tree_insert(struct AVTreeNode **rootp, void *key, int (*cmp)(void *key, const void *b));
 void av_tree_destroy(struct AVTreeNode *t);