vda: reordering headers inclusion.

13 years ago · b46134f659
parent 9837442a39
commit b46134f659
4 changed files with 8 additions and 11 deletions
--- 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"

 /**
--- 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
--- 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,
--- 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
 *