diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 14:26:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 14:26:46 +0200 |
| commit | e335658370840390272b70de92f5a76860537fb9 (patch) | |
| tree | 8f9074bfd2d0f5c6c09c34f23b354ee9dbce7e56 /libavcodec/roqaudioenc.c | |
| parent | 43cce41267a7aa71946911e87b4dfce48183bb25 (diff) | |
| parent | 9734b8ba56d05e970c353dfd5baafa43fdb08024 (diff) | |
| download | ffmpeg-e335658370840390272b70de92f5a76860537fb9.tar.gz | |
Merge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024'
* commit '9734b8ba56d05e970c353dfd5baafa43fdb08024':
Move avutil tables only used in libavcodec to libavcodec.
Conflicts:
libavcodec/mathtables.c
libavutil/intmath.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/roqaudioenc.c')
| -rw-r--r-- | libavcodec/roqaudioenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/roqaudioenc.c b/libavcodec/roqaudioenc.c index 0129051ad4..d69ccbfbe9 100644 --- a/libavcodec/roqaudioenc.c +++ b/libavcodec/roqaudioenc.c @@ -21,10 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/intmath.h" #include "avcodec.h" #include "bytestream.h" #include "internal.h" +#include "mathops.h" #define ROQ_FRAME_SIZE 735 #define ROQ_HEADER_SIZE 8 |