OSDN Git Service
(root)
/
android-x86
/
external-stagefright-plugins.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5702514
)
stagefright-plugins: Avoid QCOM-specific identifier
author
Steve Kondik
<steve@cyngn.com>
Tue, 27 Sep 2016 23:47:08 +0000
(16:47 -0700)
committer
Steve Kondik
<steve@cyngn.com>
Tue, 27 Sep 2016 23:47:08 +0000
(16:47 -0700)
Change-Id: I63568dc6ade25197bfb6940b3f7f7e1aa547ebd1
extractor/FFmpegExtractor.cpp
patch
|
blob
|
history
diff --git
a/extractor/FFmpegExtractor.cpp
b/extractor/FFmpegExtractor.cpp
index
beb437d
..
2a796ad
100644
(file)
--- a/
extractor/FFmpegExtractor.cpp
+++ b/
extractor/FFmpegExtractor.cpp
@@
-571,7
+571,7
@@
sp<MetaData> FFmpegExtractor::setAudioFormat(AVStream *stream)
meta->setInt32(kKeyBlockAlign, avctx->block_align);
meta->setInt32(kKeySampleFormat, avctx->sample_fmt);
meta->setInt32(kKeyPcmEncoding, sampleFormatToEncoding(avctx->sample_fmt));
- meta->setCString(
kKeyFileFormat
, findMatchingContainer(mFormatCtx->iformat->name));
+ meta->setCString(
'ffmt'
, findMatchingContainer(mFormatCtx->iformat->name));
setDurationMetaData(stream, meta);
}