diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 13:46:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 13:46:23 +0100 |
| commit | ad9a6e19e1a8abc0ce12ff85f9f3aaf321f16866 (patch) | |
| tree | ade9f7014de33eb08b3645b581249b0935e9ba24 | |
| parent | 3e3b0b3a40ee44343a6db7285734fe4c80718f28 (diff) | |
| parent | d24e9a99a40166bf881ccd2e3ae5688af4726658 (diff) | |
| download | ffmpeg-ad9a6e19e1a8abc0ce12ff85f9f3aaf321f16866.tar.gz | |
Merge commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658'
* commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658':
h264 does not depend on mpegvideo any more
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 1 | ||||
| -rw-r--r-- | libavcodec/h264.h | 3 | ||||
| -rw-r--r-- | libavcodec/h264_cavlc.c | 1 | ||||
| -rw-r--r-- | libavcodec/h264_direct.c | 1 | ||||
| -rw-r--r-- | libavcodec/h264_loopfilter.c | 1 | ||||
| -rw-r--r-- | libavcodec/h264data.h | 1 | ||||
| -rw-r--r-- | libavcodec/svq3.c | 1 |
7 files changed, 2 insertions, 7 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 55af004b80..d919363c66 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -38,7 +38,6 @@ #include "dsputil.h" #include "error_resilience.h" #include "avcodec.h" -#include "mpegvideo.h" #include "h264.h" #include "h264data.h" #include "h264chroma.h" diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 4694b1a2e6..7f738d58ca 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -33,13 +33,14 @@ #include "dsputil.h" #include "error_resilience.h" #include "get_bits.h" -#include "mpegvideo.h" #include "h264chroma.h" #include "h264dsp.h" #include "h264pred.h" #include "h264qpel.h" #include "mpegutils.h" +#include "parser.h" #include "rectangle.h" +#include "videodsp.h" #define H264_MAX_PICTURE_COUNT 36 #define H264_MAX_THREADS 32 diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index 25a0c0ae19..ca587a46f2 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -30,7 +30,6 @@ #include "internal.h" #include "avcodec.h" -#include "mpegvideo.h" #include "h264.h" #include "h264data.h" // FIXME FIXME FIXME #include "h264_mvpred.h" diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 28b08d9866..3cc5f85715 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -27,7 +27,6 @@ #include "internal.h" #include "avcodec.h" -#include "mpegvideo.h" #include "h264.h" #include "mpegutils.h" #include "rectangle.h" diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c index 2b0ef5b0d5..8c052c3e21 100644 --- a/libavcodec/h264_loopfilter.c +++ b/libavcodec/h264_loopfilter.c @@ -29,7 +29,6 @@ #include "libavutil/intreadwrite.h" #include "internal.h" #include "avcodec.h" -#include "mpegvideo.h" #include "h264.h" #include "mathops.h" #include "mpegutils.h" diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h index eb229f3f4d..38f32583f6 100644 --- a/libavcodec/h264data.h +++ b/libavcodec/h264data.h @@ -32,7 +32,6 @@ #include <stdint.h> #include "libavutil/rational.h" -#include "mpegvideo.h" #include "h264.h" static const uint8_t golomb_to_pict_type[5] = { diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 9aacf62194..5ff50da0d9 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -44,7 +44,6 @@ #include "internal.h" #include "avcodec.h" #include "mpegutils.h" -#include "mpegvideo.h" #include "h264.h" #include "h264data.h" // FIXME FIXME FIXME |