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 /libavcodec/h264.h | |
| 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>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 3 |
1 files changed, 2 insertions, 1 deletions
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 |