Merge commit '5d14cf199990cd378904a2618b5c72c4b02290f6'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:23:40 +0000 (11:23 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:23:40 +0000 (11:23 +0200)
commit7b865c222e43e315ef78859f5f87fb225fe09fb1
tree650110163a4c637d538d668de6da2cc9dee7de15
parentb3ff8ef6ec239085f41ee3b0b68d7ac0a4142226
parent5d14cf199990cd378904a2618b5c72c4b02290f6
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
libavcodec/libxvid.c
libavcodec/x86/mpegvideoenc_template.c