@@ -39,7 +39,8 @@

 #include "libavutil/pixfmt.h"

 #include "libavutil/rational.h"

-#include "libavcodec/version.h"

+#include "version.h"

+

 /**

  * @defgroup libavc Encoding/Decoding Library

  * @{

@@ -21,8 +21,8 @@

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

-#include "libavcodec/bytestream.h"

 #include "avcodec.h"

+#include "bytestream.h"

 #include "s3tc.h"

 static inline void dxt1_decode_pixels(GetByteContext *gb, uint32_t *d,

@@ -21,10 +21,9 @@

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

-#include "libavutil/intreadwrite.h"

-

 #include "avutil.h"

 #include "common.h"

+#include "intreadwrite.h"

 #include "blowfish.h"

 static const uint32_t orig_p[AV_BF_ROUNDS + 2] = {

@@ -339,7 +339,9 @@ void av_des_mac(AVDES *d, uint8_t *dst, const uint8_t *src, int count) {

 #ifdef TEST

 #include <stdlib.h>

 #include <stdio.h>

-#include "libavutil/time.h"

+

+#include "time.h"

+

 static uint64_t rand64(void) {

     uint64_t r = rand();

     r = (r << 32) | rand();

@@ -17,7 +17,7 @@

  */

 #include "config.h"

-#include "libavutil/attributes.h"

+#include "attributes.h"

 #include "float_dsp.h"

 static void vector_fmul_c(float *dst, const float *src0, const float *src1,

@@ -28,7 +28,7 @@

  */

 #include "libavutil/avconfig.h"

-#include "libavutil/version.h"

+#include "version.h"

 /**

  * Pixel format.

@@ -31,7 +31,7 @@

 #include <windows.h>

 #endif

-#include "libavutil/time.h"

+#include "time.h"

 #include "error.h"

 int64_t av_gettime(void)

@@ -21,10 +21,9 @@

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

-#include "libavutil/intreadwrite.h"

-

 #include "avutil.h"

 #include "common.h"

+#include "intreadwrite.h"

 #include "xtea.h"

 void av_xtea_init(AVXTEA *ctx, const uint8_t key[16])

@@ -28,8 +28,8 @@

 #include <inttypes.h>

-#include "libswscale/swscale.h"

 #include "libavutil/avutil.h"

+#include "swscale.h"

 /* A full collection of RGB to RGB(BGR) converters */

 extern void (*rgb24tobgr32)(const uint8_t *src, uint8_t *dst, int src_size);