[FFmpeg-cvslog] Merge commit '194be1f43ea391eb986732707435176e579265aa'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 18 18:18:25 2014 +0200| [ac293b66851f6c4461eab03ca91af59d5ee4e02e] | committer: Michael Niedermayer

Merge commit '194be1f43ea391eb986732707435176e579265aa'

* commit '194be1f43ea391eb986732707435176e579265aa':
  lavf: switch to AVStream.time_base as the hint for the muxer timebase

Conflicts:
	doc/APIchanges
	libavformat/filmstripenc.c
	libavformat/movenc.c
	libavformat/mxfenc.c
	libavformat/oggenc.c
	libavformat/swf.h
	libavformat/version.h
	tests/ref/lavf/mkv

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

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