Changeset 4542615 in ffmpeg

Timestamp:

Oct 21, 2014, 8:00:04 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1922357e

Parents:

2f74b8d0 (diff), e73d26bb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2'

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

Conflicts:

libavformat/smoothstreamingenc.c

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

(No files)