[vlc-devel] commit: Fix Avcodec module compilation. (Jean-Baptiste Kempf )

git version control git at videolan.org
Sat Dec 6 14:22:23 CET 2008


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Dec  6 14:22:10 2008 +0100| [e7d3f3d54df719db6a688272922bd0427b0076ab] | committer: Jean-Baptiste Kempf 

Fix Avcodec module compilation.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e7d3f3d54df719db6a688272922bd0427b0076ab
---

 modules/codec/avcodec/avcodec.h |    4 ++++
 modules/codec/avcodec/fourcc.c  |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h
index 0532499..ce3a44b 100644
--- a/modules/codec/avcodec/avcodec.h
+++ b/modules/codec/avcodec/avcodec.h
@@ -251,3 +251,7 @@ extern vlc_mutex_t avcodec_lock;
     AVCodecContext *p_context;  \
     AVCodec        *p_codec;
 
+#ifndef AV_VERSION_INT
+#   define AV_VERSION_INT(a, b, c) ((a)<<16 | (b)<<8 | (c))
+#endif
+
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 579a175..5ab3f5c 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -38,10 +38,6 @@
 #endif
 #include "avcodec.h"
 
-#ifndef AV_VERSION_INT
-#   define AV_VERSION_INT(a, b, c) ((a)<<16 | (b)<<8 | (c))
-#endif
-
 /*****************************************************************************
  * Codec fourcc -> ffmpeg_id mapping
  *****************************************************************************/




More information about the vlc-devel mailing list