From: Hendrik Leppkes <h.leppkes@gmail.com>
Date: Sat, 12 Sep 2015 13:17:50 +0000 (+0200)
Subject: Merge commit '1b2412f50185447da4212f65f06e8d72a6daf06e'
X-Git-Tag: n3.1-dev~2760
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/73e9f04ea5e80e7b99420ec4bbf6995430146ff8?hp=-c

Merge commit '1b2412f50185447da4212f65f06e8d72a6daf06e'

* commit '1b2412f50185447da4212f65f06e8d72a6daf06e':
  lavc: Fix compilation with --disable-everything --enable-parser=mpeg4video

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

73e9f04ea5e80e7b99420ec4bbf6995430146ff8