summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authormiu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-09 17:19:50 +0000
committermiu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-09 17:19:50 +0000
commit2771a05a28ea4384e70da48ca9ea0135b24d6637 (patch)
treee14dccc59526c58fbbf8b44935945f8dd266d9ca /media
parentf59498f044d33e26d93cc96f49b54a14cd56a0fe (diff)
downloadchromium_src-2771a05a28ea4384e70da48ca9ea0135b24d6637.zip
chromium_src-2771a05a28ea4384e70da48ca9ea0135b24d6637.tar.gz
chromium_src-2771a05a28ea4384e70da48ca9ea0135b24d6637.tar.bz2
Add MEDIA_EXPORT to an ffmpeg_common function to link cast_sender_app.
This is needed for the linker to resolve a reference to media::ChannelLayoutToChromeChannelLayout(), called in src/media/cast/test/sender.cc (cast_sender_app target). Review URL: https://codereview.chromium.org/270813002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/ffmpeg/ffmpeg_common.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
index 3813348..c697bee 100644
--- a/media/ffmpeg/ffmpeg_common.h
+++ b/media/ffmpeg/ffmpeg_common.h
@@ -103,8 +103,8 @@ MEDIA_EXPORT void AVCodecContextToAudioDecoderConfig(
// Converts FFmpeg's channel layout to chrome's ChannelLayout. |channels| can
// be used when FFmpeg's channel layout is not informative in order to make a
// good guess about the plausible channel layout based on number of channels.
-ChannelLayout ChannelLayoutToChromeChannelLayout(int64_t layout,
- int channels);
+MEDIA_EXPORT ChannelLayout ChannelLayoutToChromeChannelLayout(int64_t layout,
+ int channels);
// Converts FFmpeg's audio sample format to Chrome's SampleFormat.
MEDIA_EXPORT SampleFormat