[FFmpeg-cvslog] Merge commit '39523030108815242178ac5e209c83070bd1baef'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 20 12:16:31 2013 +0200| [4a6f1be170a057ee3d582e5f110ed659926c093c] | committer: Michael Niedermayer

Merge commit '39523030108815242178ac5e209c83070bd1baef'

* commit '39523030108815242178ac5e209c83070bd1baef':
  mov: Set the timescale for data streams

Conflicts:
	libavformat/movenc.c

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

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