Merge commit '6536da7371b4847a2824ed46b98829f127f24dad'

[ffmpeg] / libavcodec / libxvid.c

diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c
index 8cbeef2b39653c42d892aafa4a34dc381e460562..15b31c5eef39dc76d6bdc0e0780dbcb8950022da 100644 (file)
--- a/libavcodec/libxvid.c
+++ b/libavcodec/libxvid.c
@@ -25,17 +25,21 @@
  * @author Adam Thayer (krevnik@comcast.net)
  */
 
+#include <stdio.h>
+#include <string.h>
 #include <xvid.h>
 
 #include "libavutil/cpu.h"
 #include "libavutil/file.h"
+#include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
 
 #include "avcodec.h"
 #include "internal.h"
 #include "libxvid.h"
-#include "mpegvideo.h"
+#include "mpegutils.h"
 
 #if HAVE_UNISTD_H
 #include <unistd.h>