aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/cutils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-21 22:00:04 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-21 22:00:04 +0200
commit4542615063fbb100864fa499aca8cf4e36a38231 (patch)
tree6703c0e31d0b574a7ab0a067bc1a462cc55c9554 /libavformat/cutils.c
parent2f74b8d0edbe20a12f30385b4354bf5cbb48c80e (diff)
parente73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2 (diff)
downloadffmpeg-4542615063fbb100864fa499aca8cf4e36a38231.tar.gz
Merge commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2'
* commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2': smoothstreamingenc: explict cast to avoid overflow Conflicts: libavformat/smoothstreamingenc.c See: b399816d9c3d0fc3efd742b04f269c1055cc6e2b Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/cutils.c')
0 files changed, 0 insertions, 0 deletions