[FFmpeg-soc] [soc]: r2251 - in eac3: ac3dec.c eac3dec.c

[jbr]

Author: jbr
Date: Fri May 30 01:13:52 2008
New Revision: 2251

Log:
skip additional substreams

Modified:
   eac3/ac3dec.c
   eac3/eac3dec.c

Modified: eac3/ac3dec.c
==============================================================================
--- eac3/ac3dec.c	(original)
+++ eac3/ac3dec.c	Fri May 30 01:13:52 2008
@@ -1254,8 +1254,8 @@ static int ac3_decode_frame(AVCodecConte
                 av_log(avctx, AV_LOG_ERROR, "invalid frame size\n");
                 break;
             case AC3_PARSE_ERROR_FRAME_TYPE:
-                /* TODO: add support for dependent frames */
-                if(s->frame_type == EAC3_FRAME_TYPE_DEPENDENT) {
+                /* TODO: add support for substreams and dependent frames */
+                if(s->frame_type == EAC3_FRAME_TYPE_DEPENDENT || s->substreamid) {
                     av_log(avctx, AV_LOG_ERROR, "unsupported frame type : skipping frame\n");
                     return s->frame_size;
                 } else {

Modified: eac3/eac3dec.c
==============================================================================
--- eac3/eac3dec.c	(original)
+++ eac3/eac3dec.c	Fri May 30 01:13:52 2008
@@ -294,7 +294,7 @@ static int parse_bsi(AC3DecodeContext *s
         // TODO: allow user to select which substream to decode
         av_log(s->avctx, AV_LOG_INFO, "Skipping additional substream #%d\n",
                s->substreamid);
-        return -1;
+        return AC3_PARSE_ERROR_FRAME_TYPE;
     }
 
     /* skip parameters which have already been read */