OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f068aed
)
Support AC-3 in Sega Dreamcast Sofdec files.
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Sun, 1 Dec 2013 11:02:21 +0000
(12:02 +0100)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Sun, 1 Dec 2013 11:02:21 +0000
(12:02 +0100)
Fixes ticket #3184
libavformat/mpeg.c
patch
|
blob
|
history
diff --git
a/libavformat/mpeg.c
b/libavformat/mpeg.c
index
1ea58d5
..
90434a1
100644
(file)
--- a/
libavformat/mpeg.c
+++ b/
libavformat/mpeg.c
@@
-521,7
+521,13
@@
static int mpegps_read_packet(AVFormatContext *s,
codec_id = AV_CODEC_ID_DVD_NAV;
} else if (startcode >= 0x1c0 && startcode <= 0x1df) {
type = AVMEDIA_TYPE_AUDIO;
- codec_id = m->sofdec > 0 ? AV_CODEC_ID_ADPCM_ADX : AV_CODEC_ID_MP2;
+ if (m->sofdec > 0) {
+ codec_id = AV_CODEC_ID_ADPCM_ADX;
+ // Auto-detect AC-3
+ request_probe = 50;
+ } else {
+ codec_id = AV_CODEC_ID_MP2;
+ }
} else if (startcode >= 0x80 && startcode <= 0x87) {
type = AVMEDIA_TYPE_AUDIO;
codec_id = AV_CODEC_ID_AC3;