diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 15:47:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 15:48:27 +0100 |
| commit | e92ba51fd78dda1be8b9ab278c869eed6429514d (patch) | |
| tree | 292f1264cd0bf60ee083e0cd9b0c2e169ce6e50c /libavformat/swfenc.c | |
| parent | 23eed00925c1dfacfe88d635ff5077d691f503f8 (diff) | |
| parent | 65f1d45dcc71186ede72fff950996099d23359bd (diff) | |
| download | ffmpeg-e92ba51fd78dda1be8b9ab278c869eed6429514d.tar.gz | |
Merge commit '65f1d45dcc71186ede72fff950996099d23359bd'
* commit '65f1d45dcc71186ede72fff950996099d23359bd':
lavu: add support for atomic operations.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/swfenc.c')
0 files changed, 0 insertions, 0 deletions