commit 5faf610fa384a81dbefb7ac67d2452216e3acead
author Eric Laurent <elaurent@google.com> Fri Jan 18 02:08:52 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 18 02:08:52 2013 +0000
tree aad7da514c31c7bfe4f64506ce050c8bc46499da
parent 2ba042ff8a8bb5aa0320580119771e11e64ba2cd
parent 2592f6e68edbed386e004d5b045233f15e7b9ba1

Merge "AudioFlinger: fix build with debug log enabled"

media/libstagefright/timedtext/TimedTextSRTSource.cpp

diff --git a/media/libstagefright/timedtext/TimedTextSRTSource.cpp b/media/libstagefright/timedtext/TimedTextSRTSource.cpp
index eac23ba..2ac1e72 100644
--- a/media/libstagefright/timedtext/TimedTextSRTSource.cpp
+++ b/media/libstagefright/timedtext/TimedTextSRTSource.cpp
@@ -36,6 +36,9 @@
         : mSource(dataSource),
           mMetaData(new MetaData),
           mIndex(0) {
+    // TODO: Need to detect the language, because SRT doesn't give language
+    // information explicitly.
+    mMetaData->setCString(kKeyMediaLanguage, "und");
 }
 
 TimedTextSRTSource::~TimedTextSRTSource() {
@@ -46,14 +49,10 @@
     if (err != OK) {
         reset();
     }
-    // TODO: Need to detect the language, because SRT doesn't give language
-    // information explicitly.
-    mMetaData->setCString(kKeyMediaLanguage, "");
     return err;
 }
 
 void TimedTextSRTSource::reset() {
-    mMetaData->clear();
     mTextVector.clear();
     mIndex = 0;
 }