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/mpegvideo.c | |
parent | 43cce41267a7aa71946911e87b4dfce48183bb25 (diff) | |
parent | 9734b8ba56d05e970c353dfd5baafa43fdb08024 (diff) | |
download | ffmpeg-streaming-e335658370840390272b70de92f5a76860537fb9.zip ffmpeg-streaming-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/mpegvideo.c')
-rw-r--r-- | libavcodec/mpegvideo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index cd3ce22..2b6d5d8 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -27,11 +27,11 @@ * The simplest mpeg encoder (well, it was the simplest!). */ -#include "libavutil/intmath.h" #include "libavutil/imgutils.h" #include "avcodec.h" #include "dsputil.h" #include "internal.h" +#include "mathops.h" #include "mpegvideo.h" #include "mjpegenc.h" #include "msmpeg4.h" |