Merge commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Oct 2014 20:00:04 +0000 (22:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Oct 2014 20:00:04 +0000 (22:00 +0200)
* commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2':
  smoothstreamingenc: explict cast to avoid overflow

Conflicts:
libavformat/smoothstreamingenc.c

See: b399816d9c3d0fc3efd742b04f269c1055cc6e2b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/smoothstreamingenc.c

Simple merge