diff options
| author |  Shanqing Cai <cais@google.com> | 2017-04-22 06:08:17 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-04-22 07:28:38 -0700 |
| commit | 326942394e69074d50d5889218a24c9371eff259 (patch) | |
| tree | 50c78852c36b828440761a16650718f224560f7b /tensorflow/contrib/ffmpeg | |
| parent | 3c0900a49c11b7975c7accc026153bbc2001c018 (diff) | |
Merge changes from github.
Change: 153925676
Diffstat (limited to 'tensorflow/contrib/ffmpeg')
| -rw-r--r-- | tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc b/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc index a758bb92aa..e520139e65 100644 --- a/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc +++ b/tensorflow/contrib/ffmpeg/default/ffmpeg_lib.cc @@ -142,7 +142,7 @@ template <typename UInt> string LittleEndianData(UInt data) { static_assert(std::is_unsigned<UInt>::value, "UInt must be unsigned"); string str; - for (int i = 0; i < sizeof(UInt); ++i) { + for (size_t i = 0; i < sizeof(UInt); ++i) { const unsigned char bits = static_cast<unsigned char>(data & 0xFFU); char ch; ::memcpy(&ch, &bits, sizeof(bits)); |