[FFmpeg-cvslog] EA cdata demuxer: support 6 channel files

Peter Ross git at videolan.org
Sun Apr 24 04:16:55 CEST 2011


ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Sat Apr 23 22:09:10 2011 +1000| [db62d898330664a9b69ba5a1feee18338bb00852] | committer: Michael Niedermayer

EA cdata demuxer: support 6 channel files

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db62d898330664a9b69ba5a1feee18338bb00852
---

 libavformat/eacdata.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavformat/eacdata.c b/libavformat/eacdata.c
index 7cdd6ff..b001375 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;



More information about the ffmpeg-cvslog mailing list