diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-06-17 14:35:17 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-06-17 14:35:17 -0700 |
| commit | f693349f12a66cfad2159779757e2ea1d6d483be (patch) | |
| tree | 1c335011ec094ab03b3faaf892792b60ed3b80c4 /host/lib/convert | |
| parent | e103b5e67061c9b22cce2e36cf9b40a8213ecb82 (diff) | |
| parent | 9cc4e16b77d074c8d416725ead1afb8898007eb3 (diff) | |
| download | uhd-f693349f12a66cfad2159779757e2ea1d6d483be.tar.gz uhd-f693349f12a66cfad2159779757e2ea1d6d483be.tar.bz2 uhd-f693349f12a66cfad2159779757e2ea1d6d483be.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/convert')
| -rw-r--r-- | host/lib/convert/convert_impl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/host/lib/convert/convert_impl.cpp b/host/lib/convert/convert_impl.cpp index d90bb9c94..7dfbb33fd 100644 --- a/host/lib/convert/convert_impl.cpp +++ b/host/lib/convert/convert_impl.cpp @@ -1,5 +1,5 @@ // -// Copyright 2011 Ettus Research LLC +// Copyright 2011,2016 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -162,7 +162,6 @@ UHD_STATIC_BLOCK(convert_register_item_sizes){ convert::register_bytes_per_item("sc64", sizeof(std::complex<boost::int64_t>)); convert::register_bytes_per_item("sc32", sizeof(std::complex<boost::int32_t>)); convert::register_bytes_per_item("sc16", sizeof(std::complex<boost::int16_t>)); - convert::register_bytes_per_item("sc12", 3 * sizeof(std::complex<boost::int8_t>)); convert::register_bytes_per_item("sc8", sizeof(std::complex<boost::int8_t>)); //register standard real types |