diff options
Diffstat (limited to 'chromium/media/webm/webm_cluster_parser.cc')
| -rw-r--r-- | chromium/media/webm/webm_cluster_parser.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chromium/media/webm/webm_cluster_parser.cc b/chromium/media/webm/webm_cluster_parser.cc index 9991d6b4d15..f83a3652f03 100644 --- a/chromium/media/webm/webm_cluster_parser.cc +++ b/chromium/media/webm/webm_cluster_parser.cc @@ -214,7 +214,7 @@ bool WebMClusterParser::ParseBlock(bool is_simple_block, const uint8* buf, // Sign extend negative timecode offsets. if (timecode & 0x8000) - timecode |= ~0xffff; + timecode |= (-1 << 16); const uint8* frame_data = buf + 4; int frame_size = size - (frame_data - buf); @@ -277,8 +277,6 @@ bool WebMClusterParser::OnBlock(bool is_simple_block, int track_num, return false; } - // TODO(acolwell): Should relative negative timecode offsets be rejected? Or - // only when the absolute timecode is negative? See http://crbug.com/271794 if (timecode < 0) { MEDIA_LOG(log_cb_) << "Got a block with negative timecode offset " << timecode; |