Merge commit 'e60a6e7545dd6f5b25e3a65de9c6fdcc6e2e9d6b'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:27:20 +0000 (11:27 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:27:20 +0000 (11:27 +0200)
commit52ce8b7b31773f5dd749184445189ecd0cbca24d
tree4532eaf3564f74b6ddd9b906ac9650116d8f6b7b
parent7b865c222e43e315ef78859f5f87fb225fe09fb1
parente60a6e7545dd6f5b25e3a65de9c6fdcc6e2e9d6b
Merge commit 'e60a6e7545dd6f5b25e3a65de9c6fdcc6e2e9d6b'

* commit 'e60a6e7545dd6f5b25e3a65de9c6fdcc6e2e9d6b':
  mpegvideo: Drop mpegvideo.h where not needed

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/cavsdec.c
libavcodec/dxva2.c
libavcodec/dxva2_internal.h
libavcodec/dxva2_mpeg2.c
libavcodec/libxvid.c
libavcodec/ljpegenc.c
libavcodec/mdec.c
libavcodec/vaapi.c
libavcodec/vaapi_internal.h
libavcodec/vaapi_mpeg2.c
libavcodec/vaapi_mpeg4.c