diff options
Diffstat (limited to 'src/lib/util/aviio.cpp')
-rw-r--r-- | src/lib/util/aviio.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/util/aviio.cpp b/src/lib/util/aviio.cpp index 99958577d57..067f81fef27 100644 --- a/src/lib/util/aviio.cpp +++ b/src/lib/util/aviio.cpp @@ -298,7 +298,7 @@ public: std::uint32_t width = info.video_width; std::uint32_t height = info.video_height; - std::uint32_t integal_multiple = std::uint32_t(AVI_INTEGRAL_MULTIPLE); + auto integal_multiple = std::uint32_t(AVI_INTEGRAL_MULTIPLE); if (integal_multiple > 1) { width = width - (width % integal_multiple); @@ -720,8 +720,8 @@ inline void put_64bits(std::uint8_t *data, std::uint64_t value) inline void u64toa(std::uint64_t val, char *output) { - std::uint32_t lo = std::uint32_t(val & 0xffffffff); - std::uint32_t hi = std::uint32_t(val >> 32); + auto lo = std::uint32_t(val & 0xffffffff); + auto hi = std::uint32_t(val >> 32); if (hi != 0) sprintf(output, "%X%08X", hi, lo); else @@ -1055,7 +1055,7 @@ avi_file::error avi_stream::rgb32_compress_to_rgb(const bitmap_rgb32 &bitmap, st avi_file::error avi_stream::yuv_decompress_to_yuy16(const std::uint8_t *data, std::uint32_t numbytes, bitmap_yuy16 &bitmap) const { - std::uint16_t const *const dataend = reinterpret_cast<const std::uint16_t *>(data + numbytes); + auto const *const dataend = reinterpret_cast<const std::uint16_t *>(data + numbytes); int x, y; /* compressed video */ @@ -1107,7 +1107,7 @@ avi_file::error avi_stream::yuv_decompress_to_yuy16(const std::uint8_t *data, st avi_file::error avi_stream::yuy16_compress_to_yuy(const bitmap_yuy16 &bitmap, std::uint8_t *data, std::uint32_t numbytes) const { - std::uint16_t *const dataend = reinterpret_cast<std::uint16_t *>(data + numbytes); + auto *const dataend = reinterpret_cast<std::uint16_t *>(data + numbytes); int x, y; /* compressed video */ @@ -1871,7 +1871,7 @@ avi_file::error avi_file_impl::read_sound_samples(int channel, std::uint32_t fir /* extract 16-bit samples from the chunk */ if (stream->samplebits() == 16) { - const std::int16_t *base = reinterpret_cast<const std::int16_t *>(&m_tempbuffer[8]); + const auto *base = reinterpret_cast<const std::int16_t *>(&m_tempbuffer[8]); base += stream->channels() * (firstsample - chunkbase) + offset; for (sampnum = 0; sampnum < samples_this_chunk; sampnum++) { |