1105867 - Fix -Wunused-const-variable warnings-as-errors in nonunified build of dom/media/webm

Status: RESOLVED FIXED

(Core :: Audio/Video, defect)

Description

[Chris Peterson [:cpeterson]]

Attachment: webm_Wunused-const-variable.patch

1. NS_PER_USEC and NS_PER_S are defined in both WebMReader.h and SoftwareWebMVideoDecoder.cpp, which causes these unused variable warnings:

> dom/media/webm/SoftwareWebMVideoDecoder.cpp:24:23: error: unused variable 'NS_PER_USEC' [-Werror,-Wunused-const-variable]
> dom/media/webm/SoftwareWebMVideoDecoder.cpp:25:23: error: unused variable 'NS_PER_S' [-Werror,-Wunused-const-variable]

2. WebMReader.h's defines NS_PER_S as a double, but SoftwareWebMVideoDecoder.cpp defines NS_PER_S as an unsigned (int). Which type is correct?

3. WebMReader.h is #included by both the SoftwareWebMVideoDecoder.h and SoftwareWebMVideoDecoder.cpp (and IntelWebMVideoDecoder.h and .cpp). This patch removes the redundant #includes from the .cpp files.

Comment 1

[Chris Pearce [:cpearce (Not reading bugmail)]]

Comment on attachment 8529946 [details] [diff] [review]
webm_Wunused-const-variable.patch

Review of attachment 8529946 [details] [diff] [review]:
-----------------------------------------------------------------

-> Matthew...

Comment 2

[Matthew Gregan [:kinetik]]

Comment on attachment 8529946 [details] [diff] [review]
webm_Wunused-const-variable.patch

Review of attachment 8529946 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks.

Comment 3

[Chris Peterson [:cpeterson]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/bfe4061fffde

Comment 4

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/bfe4061fffde