Merge commit '5d14cf199990cd378904a2618b5c72c4b02290f6'

* commit '5d14cf199990cd378904a2618b5c72c4b02290f6':
  mpegvideo: Make sure mpegutils.h is included where needed

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

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"

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

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"