diff options
| author | Sebastien Zwickert <dilaroga@free.fr> | 2011-11-14 21:20:04 +0100 |
|---|---|---|
| committer | Sebastien Zwickert <dilaroga@free.fr> | 2011-11-14 22:24:03 +0100 |
| commit | b46134f6593d388e3ebdc4a49b3c7ad51335ff03 (patch) | |
| tree | 2a333ea95190cce774234dd205f4c2dc293d8b85 /libavcodec | |
| parent | 9837442a397bb300ac8226472e1d65ce85f66119 (diff) | |
| download | ffmpeg-b46134f6593d388e3ebdc4a49b3c7ad51335ff03.tar.gz | |
vda: reordering headers inclusion.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vda.c | 7 | ||||
| -rw-r--r-- | libavcodec/vda.h | 3 | ||||
| -rw-r--r-- | libavcodec/vda_h264.c | 1 | ||||
| -rw-r--r-- | libavcodec/vda_internal.h | 8 |
4 files changed, 8 insertions, 11 deletions
diff --git a/libavcodec/vda.c b/libavcodec/vda.c index 55012ceff5..c06b55340a 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 e28a6a6148..9a2af2df80 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 3fa5614eac..5d624ac132 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 c6dcaa8ff6..02c13df721 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 * |