diff avidec.c @ 296:252946de6d3f libavformat

* DV demuxer is now capable of decoding auxilary audio stream. So, everybody who still uses second streo track for dubbing can now export it. * void* -> DVDemuxContext* change (per Fabrice's suggestion). * -dv1394 capture now works in all modes.
author romansh
date Fri, 31 Oct 2003 22:26:26 +0000
parents f174d9c00bce
children 85d558a18134
line wrap: on
line diff
--- a/avidec.c	Thu Oct 30 05:40:58 2003 +0000
+++ b/avidec.c	Fri Oct 31 22:26:26 2003 +0000
@@ -33,7 +33,7 @@
     int64_t  movi_end;
     offset_t movi_list;
     AVIIndex *first, *last;
-    void* dv_demux;
+    DVDemuxContext* dv_demux;
 } AVIContext;
 
 #ifdef DEBUG
@@ -140,11 +140,16 @@
 	            handler != MKTAG('d', 'v', 'h', 'd') &&
 		    handler != MKTAG('d', 'v', 's', 'l'))
 	           goto fail;
-
-	        avi->dv_demux = dv_init_demux(s, stream_index, stream_index + 1);
+                
+		av_freep(&s->streams[0]->codec.extradata);
+		av_freep(&s->streams[0]);
+		s->nb_streams = 0;
+	        avi->dv_demux = dv_init_demux(s);
 		if (!avi->dv_demux)
 		    goto fail;
-	        stream_index++;
+	        stream_index = s->nb_streams - 1;
+		url_fskip(pb, size - 8);
+		break;
 	    case MKTAG('v', 'i', 'd', 's'):
                 codec_type = CODEC_TYPE_VIDEO;