Merge commit '98308bd44face14ea3142b501d16226eec23b75a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Aug 2013 09:15:11 +0000 (11:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Aug 2013 09:15:11 +0000 (11:15 +0200)
commitac957bc60cec69bd5724fe6f41b6fb979ac6612c
tree7da2cc23919d8a3b0cfd83e3c2f542bcc01db48d
parent976de369ddeb395af6e0aad76f63aa1d37e14aac
parent98308bd44face14ea3142b501d16226eec23b75a
Merge commit '98308bd44face14ea3142b501d16226eec23b75a'

* commit '98308bd44face14ea3142b501d16226eec23b75a':
  mkv: Add options for specifying cluster limits

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/matroskaenc.c