projects
/
platform
/
upstream
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 6.1
[platform/upstream/ffmpeg.git]
/
libavformat
/
mpeg.c
diff --git
a/libavformat/mpeg.c
b/libavformat/mpeg.c
index
864b08d
..
781c316
100644
(file)
--- a/
libavformat/mpeg.c
+++ b/
libavformat/mpeg.c
@@
-549,6
+549,9
@@
redo:
} else if (es_type == STREAM_TYPE_AUDIO_AC3) {
codec_id = AV_CODEC_ID_AC3;
type = AVMEDIA_TYPE_AUDIO;
} else if (es_type == STREAM_TYPE_AUDIO_AC3) {
codec_id = AV_CODEC_ID_AC3;
type = AVMEDIA_TYPE_AUDIO;
+ } else if (es_type == 0x90) {
+ codec_id = AV_CODEC_ID_PCM_ALAW;
+ type = AVMEDIA_TYPE_AUDIO;
} else if (m->imkh_cctv && es_type == 0x91) {
codec_id = AV_CODEC_ID_PCM_MULAW;
type = AVMEDIA_TYPE_AUDIO;
} else if (m->imkh_cctv && es_type == 0x91) {
codec_id = AV_CODEC_ID_PCM_MULAW;
type = AVMEDIA_TYPE_AUDIO;