diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-03 20:53:30 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-03 20:53:30 +0200 |
commit | 002feaf6e22c80f542d3155cf5af67ee5e945cc8 (patch) | |
tree | 1c9ec157842b1d4e6e75739fec62a80e1e433d24 /libavresample | |
parent | c16e00618122a7f1217f5174a6c4013eb57421b0 (diff) | |
parent | 28b9ac4e48f3405a82e8e87ead336188215cf1e6 (diff) | |
download | ffmpeg-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 'libavresample')
0 files changed, 0 insertions, 0 deletions