Merge commit '5aef535a64350b7bc06c5bdda8c26c9efec9443b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Mar 2015 11:13:05 +0000 (12:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Mar 2015 11:13:25 +0000 (12:13 +0100)
commitb32cae1cc24fd5e627202d85883b4e0aeef61b42
treefd9d2e079b0cf2709f46a7c033bf4ed66fed7357
parentc3f64a2233805ec238b57179b6a2477402ccfe04
parent5aef535a64350b7bc06c5bdda8c26c9efec9443b
Merge commit '5aef535a64350b7bc06c5bdda8c26c9efec9443b'

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

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