diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 21:42:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 21:42:50 +0200 |
| commit | 85d0df0c3090b99014d4e542a9476dcd8c52937d (patch) | |
| tree | 53f5e2f811c79611a0978933868ccb4a1c8f8095 | |
| parent | d52c5e9d75e92dfb2a304d523567e201f2393047 (diff) | |
| parent | 64a2e844166d62093b45e680874eea8bd1facf5b (diff) | |
| download | ffmpeg-85d0df0c3090b99014d4e542a9476dcd8c52937d.tar.gz | |
Merge commit '64a2e844166d62093b45e680874eea8bd1facf5b'
* commit '64a2e844166d62093b45e680874eea8bd1facf5b':
eamad: Use the correct headers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/eamad.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index 6b7134a98d..7fef1c8127 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -29,6 +29,7 @@ */ #include "avcodec.h" +#include "blockdsp.h" #include "bytestream.h" #include "bswapdsp.h" #include "get_bits.h" @@ -36,9 +37,8 @@ #include "eaidct.h" #include "idctdsp.h" #include "internal.h" -#include "mpeg12.h" #include "mpeg12data.h" -#include "libavutil/imgutils.h" +#include "mpeg12vlc.h" #define EA_PREAMBLE_SIZE 8 #define MADk_TAG MKTAG('M', 'A', 'D', 'k') /* MAD i-frame */ |