diff options
| author | Keith Deacon <kdeacon@ti.com> | 2011-04-25 22:39:16 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@git.omapzoom.org> | 2011-04-25 22:39:16 -0500 |
| commit | 437b2740accad2535cca798ebc4e3eff9762d48b (patch) | |
| tree | 3b291816fd2e177baeb176fa46db7d30977c17fd | |
| parent | f857f940e83033e0a18de13316706cee4250cc59 (diff) | |
| parent | 4cff2c62dd92479893f37731cde88f4d0b82a6ee (diff) | |
| download | base-437b2740accad2535cca798ebc4e3eff9762d48b.tar.gz | |
Merge "libstagefright: default values for AudioTrack in mkv parser" into p-gingerbread
| -rw-r--r-- | media/libstagefright/matroska/mkvparser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/matroska/mkvparser.cpp b/media/libstagefright/matroska/mkvparser.cpp index 7448d96337b2..8d938db3a384 100644 --- a/media/libstagefright/matroska/mkvparser.cpp +++ b/media/libstagefright/matroska/mkvparser.cpp @@ -3304,8 +3304,8 @@ double VideoTrack::GetFrameRate() const AudioTrack::AudioTrack(Segment* pSegment, const Info& i) :
Track(pSegment, i),
- m_rate(0.0),
- m_channels(0),
+ m_rate(8000.0),
+ m_channels(1),
m_bitDepth(-1)
{
assert(i.type == 2);
|