aboutsummaryrefslogtreecommitdiffstats
path: root/version.sh
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-03 20:53:30 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-03 20:53:30 +0200
commit002feaf6e22c80f542d3155cf5af67ee5e945cc8 (patch)
tree1c9ec157842b1d4e6e75739fec62a80e1e433d24 /version.sh
parentc16e00618122a7f1217f5174a6c4013eb57421b0 (diff)
parent28b9ac4e48f3405a82e8e87ead336188215cf1e6 (diff)
downloadffmpeg-002feaf6e22c80f542d3155cf5af67ee5e945cc8.tar.gz
Merge commit '28b9ac4e48f3405a82e8e87ead336188215cf1e6'
* commit '28b9ac4e48f3405a82e8e87ead336188215cf1e6': log: Remove undefined behaviour Conflicts: libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'version.sh')
0 files changed, 0 insertions, 0 deletions