[vlc-commits] commit: modules/codec/avcodec: Move HAVE_AVCODEC_MT to avcodec.h ( Jean-Paul Saman )

[git at videolan.org]

vlc | branch: master | Jean-Paul Saman <jean-paul.saman at m2x.nl> | Wed Dec  1 15:12:37 2010 +0100| [17ce236d62f0936298743effd3fd6f5bdf71d860] | committer: Jean-Paul Saman 

modules/codec/avcodec: Move HAVE_AVCODEC_MT to avcodec.h

The defined HAVE_AVCODEC_MT is used by modules/codec/avcodec/avcodec.c
and modules/codec/avcodec/video.c. It was only defined in modules/codec/avcodec/video.c.

This patch moves the define to modules/codec/avcodec/avcodec.h.

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

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

diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h
index 0f1cf65..0449f51 100644
--- a/modules/codec/avcodec/avcodec.h
+++ b/modules/codec/avcodec/avcodec.h
@@ -268,6 +268,10 @@ int ffmpeg_OpenCodec( decoder_t *p_dec );
 #   define AV_VERSION_INT(a, b, c) ((a)<<16 | (b)<<8 | (c))
 #endif
 
+#if defined(FF_THREAD_FRAME)
+#   define HAVE_AVCODEC_MT
+#endif
+
 /* Uncomment it to enable compilation with vaapi/dxva2 (you also must change the build
  * system) */
 //#define HAVE_AVCODEC_VAAPI 1
diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 6d5fd5d..85bad6e 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -55,9 +55,6 @@
 #if defined(HAVE_AVCODEC_VAAPI) || defined(HAVE_AVCODEC_DXVA2)
 #   define HAVE_AVCODEC_VA
 #endif
-#if defined(FF_THREAD_FRAME)
-#   define HAVE_AVCODEC_MT
-#endif
 
 /*****************************************************************************
  * decoder_sys_t : decoder descriptor