summaryrefslogtreecommitdiffstats
path: root/libavcodec/shorten.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-13 14:11:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-13 14:21:18 +0100
commit785f71fcd508113a4717bd6efcb2e0545b1c2e66 (patch)
tree10569a5ffb2927db648692890eb7d9e4ed7ff909 /libavcodec/shorten.c
parent2c4d5d3497e92f37604ab20d14bc509c14b08992 (diff)
parentd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a (diff)
downloadffmpeg-streaming-785f71fcd508113a4717bd6efcb2e0545b1c2e66.zip
ffmpeg-streaming-785f71fcd508113a4717bd6efcb2e0545b1c2e66.tar.gz
Merge commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a'
* commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a': dcadec: initialize variables before use Conflicts: libavcodec/dcadec.c See: 53918a1c54b49e76c3ca517e2caada8372995712 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/shorten.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud