[FFmpeg-cvslog] Merge commit '8b516f154a0a08655cec2d13d12aadc58cae0b1c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 22 12:08:40 2013 +0100| [d86e27758f4d691506e50d72fca97f0ec72d9ea0] | committer: Michael Niedermayer

Merge commit '8b516f154a0a08655cec2d13d12aadc58cae0b1c'

* commit '8b516f154a0a08655cec2d13d12aadc58cae0b1c':
  matroskadec: use correct compression parameters for current track CodecPrivate

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

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