diff options
| author | Michael Niedermayer <[email protected]> | 2014-03-01 05:11:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-03-01 05:11:37 +0100 |
| commit | c4c2b2ea5c0a1879f512c2023956d7322edc98d3 (patch) | |
| tree | 8967a82887bfff277faf03560514f78fe81bc780 /libavutil/atomic_gcc.h | |
| parent | 5aab33dea38ee262d6345e8348a184609a2ee46e (diff) | |
| parent | 0a36988e48dd581d29e77f768f987738bdf365f0 (diff) | |
Merge commit '0a36988e48dd581d29e77f768f987738bdf365f0'
* commit '0a36988e48dd581d29e77f768f987738bdf365f0':
build: Let AMV decoder depend on the SP5X decoder
Conflicts:
configure
libavcodec/Makefile
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavutil/atomic_gcc.h')
0 files changed, 0 insertions, 0 deletions