Revert 95496 - Create media.dll

Review URL: http://codereview.chromium.org/7523051

TBR=darin@chromium.org
Review URL: http://codereview.chromium.org/7491048

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95561 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 15 insertions, 18 deletions

diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
index dec47df..5ac0607 100644
--- a/media/ffmpeg/ffmpeg_common.h
+++ b/media/ffmpeg/ffmpeg_common.h
@@ -12,7 +12,6 @@
 #include "base/memory/singleton.h"
 #include "base/time.h"
 #include "media/base/channel_layout.h"
-#include "media/base/media_export.h"
 #include "media/video/video_decode_engine.h"
 
 // Include FFmpeg header files.
@@ -55,15 +54,15 @@ class ScopedPtrAVFreePacket {
 // For example if |timestamp| equals 11025 and |time_base| equals {1, 44100}
 // then the return value will be a base::TimeDelta for 0.25 seconds since that
 // is how much time 11025/44100ths of a second represents.
-MEDIA_EXPORT base::TimeDelta ConvertFromTimeBase(const AVRational& time_base,
-                                                 int64 timestamp);
+base::TimeDelta ConvertFromTimeBase(const AVRational& time_base,
+                                    int64 timestamp);
 
 // Converts a base::TimeDelta into an int64 timestamp in |time_base| units.
 // For example if |timestamp| is 0.5 seconds and |time_base| is {1, 44100}, then
 // the return value will be 22050 since that is how many 1/44100ths of a second
 // represent 0.5 seconds.
-MEDIA_EXPORT int64 ConvertToTimeBase(const AVRational& time_base,
-                                     const base::TimeDelta& timestamp);
+int64 ConvertToTimeBase(const AVRational& time_base,
+                        const base::TimeDelta& timestamp);
 
 VideoCodec CodecIDToVideoCodec(CodecID codec_id);
 CodecID VideoCodecToCodecID(VideoCodec video_codec);
@@ -81,9 +80,9 @@ base::TimeDelta GetFrameDuration(AVStream* stream);
 // Returns true if a valid seek point was found after |timestamp| and
 // |seek_time| was set. Returns false if a seek point could not be
 // found or the parameters are invalid.
-MEDIA_EXPORT bool GetSeekTimeAfter(AVStream* stream,
-                                   const base::TimeDelta& timestamp,
-                                   base::TimeDelta* seek_time);
+bool GetSeekTimeAfter(AVStream* stream,
+                      const base::TimeDelta& timestamp,
+                      base::TimeDelta* seek_time);
 
 // Get the number of bytes required to play the stream over a specified
 // time range. This is an estimate based on the available index data.
@@ -98,12 +97,12 @@ MEDIA_EXPORT bool GetSeekTimeAfter(AVStream* stream,
 // |range_end| - The end time for the range covered by |bytes|. This may be
 //               different than |end_time| if the index doesn't have data for
 //               that exact time. |range_end| >= |end_time|
-MEDIA_EXPORT bool GetStreamByteCountOverRange(AVStream* stream,
-                                              const base::TimeDelta& start_time,
-                                              const base::TimeDelta& end_time,
-                                              int64* bytes,
-                                              base::TimeDelta* range_start,
-                                              base::TimeDelta* range_end);
+bool GetStreamByteCountOverRange(AVStream* stream,
+                                 const base::TimeDelta& start_time,
+                                 const base::TimeDelta& end_time,
+                                 int64* bytes,
+                                 base::TimeDelta* range_start,
+                                 base::TimeDelta* range_end);
 
 // Calculates the width and height of the video surface using the video's
 // encoded dimensions and sample_aspect_ratio.
diff --git a/media/ffmpeg/file_protocol.h b/media/ffmpeg/file_protocol.h
index 7c16c4b..ed37467 100644
--- a/media/ffmpeg/file_protocol.h
+++ b/media/ffmpeg/file_protocol.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
@@ -8,9 +8,7 @@
 #ifndef MEDIA_FFMPEG_FILE_PROTOCOL_H_
 #define MEDIA_FFMPEG_FILE_PROTOCOL_H_
 
-#include "media/base/media_export.h"
-
 struct URLProtocol;
-MEDIA_EXPORT extern URLProtocol kFFmpegFileProtocol;
+extern URLProtocol kFFmpegFileProtocol;
 
 #endif  // MEDIA_FFMPEG_FILE_PROTOCOL_H_