[FFmpeg-cvslog] Merge commit '49d7fcd774ac31f242818ad9d45d9c013f3bb3db'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Oct 16 23:04:14 2015 +0200| [eebea62671b64e317bfd1a0670287e7d1b85fb04] | committer: Hendrik Leppkes

Merge commit '49d7fcd774ac31f242818ad9d45d9c013f3bb3db'

* commit '49d7fcd774ac31f242818ad9d45d9c013f3bb3db':
  mpeg12: Unbreak building stale code

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eebea62671b64e317bfd1a0670287e7d1b85fb04
---