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 /libavutil/Makefile | |
| 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 'libavutil/Makefile')
| -rw-r--r-- | libavutil/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index 544c33f240..4a36757e8b 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -59,6 +59,7 @@ BUILT_HEADERS = avconfig.h OBJS = adler32.o \ aes.o \ + atomic.o \ audio_fifo.o \ avstring.o \ base64.o \ @@ -108,6 +109,7 @@ SKIPHEADERS = old_pix_fmts.h TESTPROGS = adler32 \ aes \ + atomic \ avstring \ base64 \ blowfish \ |