[FFmpeg-cvslog] Merge commit '5aef535a64350b7bc06c5bdda8c26c9efec9443b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  6 12:13:05 2015 +0100| [b32cae1cc24fd5e627202d85883b4e0aeef61b42] | committer: Michael Niedermayer

Merge commit '5aef535a64350b7bc06c5bdda8c26c9efec9443b'

* commit '5aef535a64350b7bc06c5bdda8c26c9efec9443b':
  dashenc: Update extradata for mov muxer

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

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