[FFmpeg-cvslog] Merge commit '81eec081afea9fc017a175581ceea7c420a0dfc3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 29 12:48:36 2014 +0200| [bc59d39b824900bafb53bf174314a59c2491f2e3] | committer: Michael Niedermayer

Merge commit '81eec081afea9fc017a175581ceea7c420a0dfc3'

* commit '81eec081afea9fc017a175581ceea7c420a0dfc3':
  matroskaenc: base DefaultDuration on the framerate, not the codec timebase

Conflicts:
	libavformat/matroskaenc.c
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv

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

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