| @@ -35,7 +35,6 @@ | |||||
| #include "dsputil.h" | #include "dsputil.h" | ||||
| #include "error_resilience.h" | #include "error_resilience.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "mpegvideo.h" | |||||
| #include "h264.h" | #include "h264.h" | ||||
| #include "h264data.h" | #include "h264data.h" | ||||
| #include "h264chroma.h" | #include "h264chroma.h" | ||||
| @@ -33,13 +33,14 @@ | |||||
| #include "dsputil.h" | #include "dsputil.h" | ||||
| #include "error_resilience.h" | #include "error_resilience.h" | ||||
| #include "get_bits.h" | #include "get_bits.h" | ||||
| #include "mpegvideo.h" | |||||
| #include "h264chroma.h" | #include "h264chroma.h" | ||||
| #include "h264dsp.h" | #include "h264dsp.h" | ||||
| #include "h264pred.h" | #include "h264pred.h" | ||||
| #include "h264qpel.h" | #include "h264qpel.h" | ||||
| #include "mpegutils.h" | #include "mpegutils.h" | ||||
| #include "parser.h" | |||||
| #include "rectangle.h" | #include "rectangle.h" | ||||
| #include "videodsp.h" | |||||
| #define H264_MAX_PICTURE_COUNT 32 | #define H264_MAX_PICTURE_COUNT 32 | ||||
| #define H264_MAX_THREADS 16 | #define H264_MAX_THREADS 16 | ||||
| @@ -29,7 +29,6 @@ | |||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "mpegvideo.h" | |||||
| #include "h264.h" | #include "h264.h" | ||||
| #include "h264data.h" // FIXME FIXME FIXME | #include "h264data.h" // FIXME FIXME FIXME | ||||
| #include "h264_mvpred.h" | #include "h264_mvpred.h" | ||||
| @@ -27,7 +27,6 @@ | |||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "mpegvideo.h" | |||||
| #include "h264.h" | #include "h264.h" | ||||
| #include "mpegutils.h" | #include "mpegutils.h" | ||||
| #include "rectangle.h" | #include "rectangle.h" | ||||
| @@ -29,7 +29,6 @@ | |||||
| #include "libavutil/intreadwrite.h" | #include "libavutil/intreadwrite.h" | ||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "mpegvideo.h" | |||||
| #include "h264.h" | #include "h264.h" | ||||
| #include "mathops.h" | #include "mathops.h" | ||||
| #include "mpegutils.h" | #include "mpegutils.h" | ||||
| @@ -32,7 +32,6 @@ | |||||
| #include <stdint.h> | #include <stdint.h> | ||||
| #include "libavutil/rational.h" | #include "libavutil/rational.h" | ||||
| #include "mpegvideo.h" | |||||
| #include "h264.h" | #include "h264.h" | ||||
| static const uint8_t golomb_to_pict_type[5] = { | static const uint8_t golomb_to_pict_type[5] = { | ||||
| @@ -44,7 +44,6 @@ | |||||
| #include "internal.h" | #include "internal.h" | ||||
| #include "avcodec.h" | #include "avcodec.h" | ||||
| #include "mpegutils.h" | #include "mpegutils.h" | ||||
| #include "mpegvideo.h" | |||||
| #include "h264.h" | #include "h264.h" | ||||
| #include "h264data.h" // FIXME FIXME FIXME | #include "h264data.h" // FIXME FIXME FIXME | ||||