diff options
| author | Michael Niedermayer | 2011-06-05 02:33:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2011-06-05 03:00:31 +0200 |
| commit | 46eb300d016b69b5fedb0410df98e3c698090c8c (patch) | |
| tree | 7aa230d9098654e1ce94bc32c2cfb8f1463e9e3b /libavcodec/mpc.h | |
| parent | 124a9edb5f172ce36b11fd0d6ccc9f15cc51f322 (diff) | |
| parent | 594fbe42c6b21aef76b938ce97524fa92a48e7a0 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ARM: remove MULL inline asm
mathops: use MUL64 macro where it forms part of other ops
tty: factorise returning error codes.
rawdec: add framerate private option.
x11grab: add framerate private option.
fbdev,v4l2: remove some forgotten uses of AVFormatParameters.time_base.
bktr: don't error when AVFormatParameters.time_base isn't set.
cmdutils: add missing const qualifier
Skip headers not designed to work standalone during 'make checkheaders'.
Add missing #includes to make headers self-contained.
musepack: remove unnecessary #include from mpcdata.h
musepack: remove extraneous mpcdata.h inclusions
Fix error check in av_file_map()
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpc.h')
| -rw-r--r-- | libavcodec/mpc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/mpc.h b/libavcodec/mpc.h index 365580ebd0..cd5769234c 100644 --- a/libavcodec/mpc.h +++ b/libavcodec/mpc.h @@ -34,8 +34,7 @@ #include "get_bits.h" #include "dsputil.h" #include "mpegaudio.h" - -#include "mpcdata.h" +#include "mpegaudiodsp.h" #define BANDS 32 #define SAMPLES_PER_BAND 36 |