]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ddc849 8b516f1)
Merge commit '8b516f154a0a08655cec2d13d12aadc58cae0b1c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Nov 2013 11:08:40 +0000 (12:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Nov 2013 11:09:30 +0000 (12:09 +0100)
* commit '8b516f154a0a08655cec2d13d12aadc58cae0b1c':
  matroskadec: use correct compression parameters for current track CodecPrivate

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.