aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ross <pross@xvid.org>2011-04-23 22:09:10 +1000
committerMichael Niedermayer <michaelni@gmx.at>2011-04-24 03:52:40 +0200
commitdb62d898330664a9b69ba5a1feee18338bb00852 (patch)
tree7516b82531fced144eae6fd5d1a2f82c7d8ebbda
parentc8a5e8a8948bcd7c0d01d3f64d58c1dc7e29d4e2 (diff)
downloadffmpeg-db62d898330664a9b69ba5a1feee18338bb00852.tar.gz
EA cdata demuxer: support 6 channel files
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/eacdata.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/eacdata.c b/libavformat/eacdata.c
index 7cdd6ff22d..b00137582c 100644
--- a/libavformat/eacdata.c
+++ b/libavformat/eacdata.c
@@ -39,7 +39,7 @@ static int cdata_probe(AVProbeData *p)
{
const uint8_t *b = p->buf;
- if (b[0] == 0x04 && (b[1] == 0x00 || b[1] == 0x04 || b[1] == 0x0C))
+ if (b[0] == 0x04 && (b[1] == 0x00 || b[1] == 0x04 || b[1] == 0x0C || b[1] == 0x14))
return AVPROBE_SCORE_MAX/8;
return 0;
}
@@ -56,6 +56,7 @@ static int cdata_read_header(AVFormatContext *s, AVFormatParameters *ap)
case 0x0400: cdata->channels = 1; break;
case 0x0404: cdata->channels = 2; break;
case 0x040C: cdata->channels = 4; break;
+ case 0x0414: cdata->channels = 6; break;
default:
av_log(s, AV_LOG_INFO, "unknown header 0x%04x\n", header);
return -1;