diff options
| author | Moonchild <mcwerewolf@wolfbeast.com> | 2018-12-31 22:56:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-31 22:56:49 +0100 |
| commit | 626d40774e411c0c286eac6fada26a85b6bfff5e (patch) | |
| tree | 9e5a4a7dbe307923ae8d6f76971759610e4db3de | |
| parent | 5920c1dc65a9801a5f7366921a642dcd301803c5 (diff) | |
| parent | 7a39cd52e5c39f95fb8351a1501e07c9c1aae947 (diff) | |
| download | UXP-626d40774e411c0c286eac6fada26a85b6bfff5e.tar UXP-626d40774e411c0c286eac6fada26a85b6bfff5e.tar.gz UXP-626d40774e411c0c286eac6fada26a85b6bfff5e.tar.lz UXP-626d40774e411c0c286eac6fada26a85b6bfff5e.tar.xz UXP-626d40774e411c0c286eac6fada26a85b6bfff5e.zip | |
Merge pull request #922 from trav90/media-work
Avoid redefined macro warning in MediaFormatReader
| -rw-r--r-- | dom/media/MediaFormatReader.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dom/media/MediaFormatReader.cpp b/dom/media/MediaFormatReader.cpp index 06e8b963b..773434710 100644 --- a/dom/media/MediaFormatReader.cpp +++ b/dom/media/MediaFormatReader.cpp @@ -32,6 +32,10 @@ using mozilla::layers::Image; using mozilla::layers::LayerManager; using mozilla::layers::LayersBackend; +// avoid redefined macro warning in unified builds +#undef LOG +#undef LOGV + static mozilla::LazyLogModule sFormatDecoderLog("MediaFormatReader"); mozilla::LazyLogModule gMediaDemuxerLog("MediaDemuxer"); |