Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(856)

Unified Diff: media/webm/webm_stream_parser.cc

Issue 12638030: Make AudioDecoderConfig copyable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/source_buffer_stream.cc ('k') | webkit/media/crypto/ppapi_decryptor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/webm/webm_stream_parser.cc
diff --git a/media/webm/webm_stream_parser.cc b/media/webm/webm_stream_parser.cc
index ca7ec306e8ff25942682ba9dc1c060f54b62bb87..b60de5da5dfe2fdba2abcd26c0d833851273f937 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();
« no previous file with comments | « media/filters/source_buffer_stream.cc ('k') | webkit/media/crypto/ppapi_decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698