diff options
| author | Roman Shaposhnik <roman@shaposhnik.org> | 2003-10-31 22:26:26 +0000 |
|---|---|---|
| committer | Roman Shaposhnik <roman@shaposhnik.org> | 2003-10-31 22:26:26 +0000 |
| commit | ddaae6a9d1ea69b55b842b65e5c664b1e6d15e13 (patch) | |
| tree | d239d8ef3b625cac08f0f8166ec65fe25b2e4b2d /libavformat/avidec.c | |
| parent | 99614dd4e924c1083fdf35f49b1da95971dc416f (diff) | |
| download | ffmpeg-ddaae6a9d1ea69b55b842b65e5c664b1e6d15e13.tar.gz | |
* 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.
Originally committed as revision 2458 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avidec.c')
| -rw-r--r-- | libavformat/avidec.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 5f55a21f32..9f235eec4d 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -33,7 +33,7 @@ typedef struct { int64_t movi_end; offset_t movi_list; AVIIndex *first, *last; - void* dv_demux; + DVDemuxContext* dv_demux; } AVIContext; #ifdef DEBUG @@ -140,11 +140,16 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) 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; |