diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-02-27 00:11:14 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-02-27 00:11:14 +0000 |
| commit | 7122f7c77149d931b664f8dbca82995f82c22bc9 (patch) | |
| tree | dc72104a416e905a35b8e7dce0e8392a8b7bf82b | |
| parent | a93575fa3dc7a49c322320d437f500702423c9bf (diff) | |
| download | ffmpeg-7122f7c77149d931b664f8dbca82995f82c22bc9.tar.gz | |
Revert previous commit that contained an unrelated hunk.
Originally committed as revision 8137 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavutil/Makefile | 2 | ||||
| -rw-r--r-- | libavutil/tree.h | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index e7658f0916..8155d5acb0 100644 --- 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 b23051c9ce..36897ef46e 100644 --- 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); |