generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* DV demuxer is now capable of decoding auxilary audio stream. So,

Browse Source 
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
This commit is contained in:
Roman Shaposhnik
2003-10-31 22:26:26 +00:00
parent 99614dd4e9
commit ddaae6a9d1
6 changed files with 124 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/avidec.c
View File

@@ -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;