[FFmpeg-cvslog] vda: reordering headers inclusion.

[Sebastien Zwickert]

ffmpeg | branch: master | Sebastien Zwickert <dilaroga at free.fr> | Mon Nov 14 21:20:04 2011 +0100| [b46134f6593d388e3ebdc4a49b3c7ad51335ff03] | committer: Sebastien Zwickert

vda: reordering headers inclusion.

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

 libavcodec/vda.c          |    7 +++++++
 libavcodec/vda.h          |    3 ---
 libavcodec/vda_h264.c     |    1 +
 libavcodec/vda_internal.h |    8 --------
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/libavcodec/vda.c b/libavcodec/vda.c
index 55012ce..c06b553 100644
--- a/libavcodec/vda.c
+++ b/libavcodec/vda.c
@@ -20,6 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <pthread.h>
+#include <CoreFoundation/CFDictionary.h>
+#include <CoreFoundation/CFNumber.h>
+#include <CoreFoundation/CFData.h>
+#include <CoreFoundation/CFString.h>
+
+#include "avcodec.h"
 #include "vda_internal.h"
 
 /**
diff --git a/libavcodec/vda.h b/libavcodec/vda.h
index e28a6a6..9a2af2d 100644
--- a/libavcodec/vda.h
+++ b/libavcodec/vda.h
@@ -29,9 +29,6 @@
 // http://openradar.appspot.com/8026390
 #undef __GNUC_STDC_INLINE__
 
-#include <pthread.h>
-#include "avcodec.h"
-
 #define Picture QuickdrawPicture
 #include <VideoDecodeAcceleration/VDADecoder.h>
 #undef Picture
diff --git a/libavcodec/vda_h264.c b/libavcodec/vda_h264.c
index 3fa5614..5d624ac 100644
--- a/libavcodec/vda_h264.c
+++ b/libavcodec/vda_h264.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "h264.h"
 #include "vda_internal.h"
 
 static int start_frame(AVCodecContext *avctx,
diff --git a/libavcodec/vda_internal.h b/libavcodec/vda_internal.h
index c6dcaa8..02c13df 100644
--- a/libavcodec/vda_internal.h
+++ b/libavcodec/vda_internal.h
@@ -23,16 +23,8 @@
 #ifndef AVCODEC_VDA_INTERNAL_H
 #define AVCODEC_VDA_INTERNAL_H
 
-#include "h264.h"
-#include "h264data.h"
-
 #include "vda.h"
 
-#include <CoreFoundation/CFDictionary.h>
-#include <CoreFoundation/CFNumber.h>
-#include <CoreFoundation/CFData.h>
-#include <CoreFoundation/CFString.h>
-
 /**
  * \addtogroup VDA_Decoding
  *