diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 11:03:32 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 11:03:32 +0200 |
commit | 4d50d53a6d604043b1020945f603a8adfc6a67cc (patch) | |
tree | 4c76be5d0ba5ab7d7a043fe7eb4228b6f32b033a /libavutil/buffer.c | |
parent | 82d9c4e5789cefc35567e9e5e2c06c03a070f605 (diff) | |
parent | 9286de045968ad456d4e752651eec22de5e89060 (diff) | |
download | ffmpeg-4d50d53a6d604043b1020945f603a8adfc6a67cc.tar.gz |
Merge commit '9286de045968ad456d4e752651eec22de5e89060'
* commit '9286de045968ad456d4e752651eec22de5e89060':
mov: Double-check that alias path is not an absolute path
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/buffer.c')
0 files changed, 0 insertions, 0 deletions