summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-17 22:30:58 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-17 22:31:26 +0100
commit3d5c0ba816b97d45ccba229ed1a0ff9d82952e1e (patch)
tree9a24d8223a8c88a8f6feeae65c3e03c0f19d6af6 /tools
parent2a1b79d7e6596033618b23345aa24607f93e1614 (diff)
parentec17782e17de1e8501ca213e276dfe5412ff1d11 (diff)
downloadffmpeg-streaming-3d5c0ba816b97d45ccba229ed1a0ff9d82952e1e.zip
ffmpeg-streaming-3d5c0ba816b97d45ccba229ed1a0ff9d82952e1e.tar.gz
Merge commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11'
* commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11': dvdsubdec: Check memory allocations Conflicts: libavcodec/dvdsubdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud