diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 21:29:31 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 21:29:31 +0100 |
commit | 3832db1223999819e2846284292ea6f3ef1b1c49 (patch) | |
tree | c9d773d7af3a65c2e802b39d6344cd695474461e /doc/APIchanges | |
parent | 2a4d9b9af09c7b6069fe8150a39a9c75d99c8aee (diff) | |
parent | 57c36de7265761dd94fb6bb4a9180011f796128f (diff) | |
download | ffmpeg-3832db1223999819e2846284292ea6f3ef1b1c49.tar.gz |
Merge commit '57c36de7265761dd94fb6bb4a9180011f796128f' into release/0.10
* commit '57c36de7265761dd94fb6bb4a9180011f796128f':
vp8: avoid race condition on segment map.
Conflicts:
libavcodec/vp8.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/APIchanges')
0 files changed, 0 insertions, 0 deletions