[FFmpeg-cvslog] Merge commit 'f36f6a608b5b2c17f8876195c61621c8f8607cee'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 11 19:50:08 2015 +0100| [7cc63c4bbc723e40fd7b1c42ed852b59aabb3c23] | committer: Michael Niedermayer

Merge commit 'f36f6a608b5b2c17f8876195c61621c8f8607cee'

* commit 'f36f6a608b5b2c17f8876195c61621c8f8607cee':
  mlpdec: support major sync headers with optional extension blocks

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

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