From 352ea6fe5b6fb0e92a12977fd5ccf63f858c22b1 Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Thu, 13 Mar 2014 19:35:02 -0700 Subject: [PATCH] Backed out changeset d42a36615c7e (bug 983204) for build bustage on an otherwise CLOSED TREE --- content/media/omx/RtspOmxReader.cpp | 12 ------------ content/media/omx/RtspOmxReader.h | 3 --- 2 files changed, 15 deletions(-) diff --git a/content/media/omx/RtspOmxReader.cpp b/content/media/omx/RtspOmxReader.cpp index 3923c9319fb..92c762e6667 100644 --- a/content/media/omx/RtspOmxReader.cpp +++ b/content/media/omx/RtspOmxReader.cpp @@ -299,18 +299,6 @@ nsresult RtspOmxReader::Seek(int64_t aTime, int64_t aStartTime, return MediaOmxReader::Seek(aTime, aStartTime, aEndTime, aCurrentTime); } -nsresult -RtspOmxReader::ReadMetadata(MediaInfo* aInfo, - MetadataTags** aTags) -{ - nsresult rv = MediaOmxReader::ReadMetadata(); - NS_ENSURE_SUCCESS(rv, rv); - - SetActive(); - - return NS_OK; -} - void RtspOmxReader::SetIdle() { // Need to pause RTSP streaming OMXCodec decoding. if (mRtspResource) { diff --git a/content/media/omx/RtspOmxReader.h b/content/media/omx/RtspOmxReader.h index 0fd60b2dcd1..80093662a9d 100644 --- a/content/media/omx/RtspOmxReader.h +++ b/content/media/omx/RtspOmxReader.h @@ -44,9 +44,6 @@ public: MOZ_COUNT_DTOR(RtspOmxReader); } - virtual nsresult ReadMetadata(MediaInfo* aInfo, - MetadataTags** aTags) MOZ_OVERRIDE; - // Implement a time-based seek instead of byte-based.. virtual nsresult Seek(int64_t aTime, int64_t aStartTime, int64_t aEndTime, int64_t aCurrentTime) MOZ_FINAL MOZ_OVERRIDE;