diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-16 11:23:40 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-16 11:23:40 +0200 |
| commit | 7b865c222e43e315ef78859f5f87fb225fe09fb1 (patch) | |
| tree | 650110163a4c637d538d668de6da2cc9dee7de15 /libavcodec | |
| parent | b3ff8ef6ec239085f41ee3b0b68d7ac0a4142226 (diff) | |
| parent | 5d14cf199990cd378904a2618b5c72c4b02290f6 (diff) | |
| download | ffmpeg-streaming-7b865c222e43e315ef78859f5f87fb225fe09fb1.zip ffmpeg-streaming-7b865c222e43e315ef78859f5f87fb225fe09fb1.tar.gz | |
Merge commit '5d14cf199990cd378904a2618b5c72c4b02290f6'
* commit '5d14cf199990cd378904a2618b5c72c4b02290f6':
mpegvideo: Make sure mpegutils.h is included where needed
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/intelh263dec.c | 1 | ||||
| -rw-r--r-- | libavcodec/libxvid.c | 1 | ||||
| -rw-r--r-- | libavcodec/x86/mpegvideoenc_template.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c index 33f7ffd..fe8d185 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "mpegutils.h" #include "mpegvideo.h" #include "h263.h" #include "mpegvideodata.h" diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 8cbeef2..785c4db 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -35,6 +35,7 @@ #include "avcodec.h" #include "internal.h" #include "libxvid.h" +#include "mpegutils.h" #include "mpegvideo.h" #if HAVE_UNISTD_H diff --git a/libavcodec/x86/mpegvideoenc_template.c b/libavcodec/x86/mpegvideoenc_template.c index 1899ba2..da76459 100644 --- a/libavcodec/x86/mpegvideoenc_template.c +++ b/libavcodec/x86/mpegvideoenc_template.c @@ -24,6 +24,7 @@ #include "libavutil/internal.h" #include "libavutil/x86/asm.h" +#include "libavcodec/mpegutils.h" #include "libavcodec/mpegvideo.h" #include "fdct.h" |
