[FFmpeg-cvslog] Merge commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 26 14:04:39 2014 +0200| [cf0e8e7ad4881d816546e0391c0e8256cbaa29dc] | committer: Michael Niedermayer

Merge commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9'

* commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9':
  mpeg: Write H264 streams at offset 2

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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