[FFmpeg-cvslog] Merge commit '98308bd44face14ea3142b501d16226eec23b75a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 20 11:15:11 2013 +0200| [ac957bc60cec69bd5724fe6f41b6fb979ac6612c] | committer: Michael Niedermayer

Merge commit '98308bd44face14ea3142b501d16226eec23b75a'

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

Conflicts:
	libavformat/matroskaenc.c

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

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