[FFmpeg-cvslog] Merge commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 21 22:00:04 2014 +0200| [4542615063fbb100864fa499aca8cf4e36a38231] | committer: Michael Niedermayer

Merge commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2'

* commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2':
  smoothstreamingenc: explict cast to avoid overflow

Conflicts:
	libavformat/smoothstreamingenc.c

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

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