[FFmpeg-cvslog] Merge commit '9cbf70fa0e44613590b019cef1fe99aa3f3c5d9d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov  8 00:41:51 2014 +0100| [c9a9a7a1fd7e00a838a94e3792235ceb4755648c] | committer: Michael Niedermayer

Merge commit '9cbf70fa0e44613590b019cef1fe99aa3f3c5d9d'

* commit '9cbf70fa0e44613590b019cef1fe99aa3f3c5d9d':
  movenc: Write correct presentation timestamps in tfra

Conflicts:
	libavformat/version.h

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

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