[FFmpeg-cvslog] Merge commit 'da7e561964ee833678dc24fae0b0265358126d1e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 25 01:05:10 2015 +0100| [53dd75e91154100a83b11f6ef9dfd15d79bcc3aa] | committer: Michael Niedermayer

Merge commit 'da7e561964ee833678dc24fae0b0265358126d1e'

* commit 'da7e561964ee833678dc24fae0b0265358126d1e':
  matroskaenc: Allow writing track "forced" flag

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

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