summaryrefslogtreecommitdiffstats
path: root/media/webm
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-14 14:54:59 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-14 14:54:59 +0000
commita3e2867b33d282e1e6a33f9e493285ed0f57920f (patch)
tree86fd4532a2a2695704c0366ca755acec93fd87c8 /media/webm
parentceffbde06c69531745924a6374b4392f34c22e51 (diff)
downloadchromium_src-a3e2867b33d282e1e6a33f9e493285ed0f57920f.zip
chromium_src-a3e2867b33d282e1e6a33f9e493285ed0f57920f.tar.gz
chromium_src-a3e2867b33d282e1e6a33f9e493285ed0f57920f.tar.bz2
Make AudioDecoderConfig copyable.
This is a follow-up CL of r187702. BUG=177543 TEST=All tests pass. Review URL: https://chromiumcodereview.appspot.com/12638030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188072 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/webm')
-rw-r--r--media/webm/webm_stream_parser.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/webm/webm_stream_parser.cc b/media/webm/webm_stream_parser.cc
index ca7ec30..b60de5d 100644
--- a/media/webm/webm_stream_parser.cc
+++ b/media/webm/webm_stream_parser.cc
@@ -364,7 +364,7 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) {
FireNeedKey(tracks_parser.audio_encryption_key_id());
} else {
- audio_config.CopyFrom(config_helper.audio_config());
+ audio_config = config_helper.audio_config();
}
bool is_video_encrypted = !tracks_parser.video_encryption_key_id().empty();