opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-01 21:48:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix avidec.c compilation when dv demuxer is disabled.

Browse Source 
Originally committed as revision 6986 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs
2006-11-12 16:35:19 +00:00
parent b43afb5343
commit a2a6332b56
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/avidec.c
View File

@ -306,9 +306,11 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
av_freep(&s->streams[0]->codec->extradata); av_freep(&s->streams[0]->codec->extradata);
av_freep(&s->streams[0]); av_freep(&s->streams[0]);
s->nb_streams = 0; s->nb_streams = 0;
if (ENABLE_DV_DEMUXER) {
avi->dv_demux = dv_init_demux(s); avi->dv_demux = dv_init_demux(s);
if (!avi->dv_demux) if (!avi->dv_demux)
goto fail; goto fail;
}
s->streams[0]->priv_data = ast; s->streams[0]->priv_data = ast;
url_fskip(pb, 3 * 4); url_fskip(pb, 3 * 4);
ast->scale = get_le32(pb); ast->scale = get_le32(pb);
@ -525,7 +527,7 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
offset_t i, sync; offset_t i, sync;
void* dstr; void* dstr;
if (avi->dv_demux) { if (ENABLE_DV_DEMUXER && avi->dv_demux) {
size = dv_get_packet(avi->dv_demux, pkt); size = dv_get_packet(avi->dv_demux, pkt);
if (size >= 0) if (size >= 0)
return size; return size;
@ -594,7 +596,7 @@ resync:
size= ast->remaining; size= ast->remaining;
av_get_packet(pb, pkt, size); av_get_packet(pb, pkt, size);
if (avi->dv_demux) { if (ENABLE_DV_DEMUXER && avi->dv_demux) {
dstr = pkt->destruct; dstr = pkt->destruct;
size = dv_produce_packet(avi->dv_demux, pkt, size = dv_produce_packet(avi->dv_demux, pkt,
pkt->data, pkt->size); pkt->data, pkt->size);
@ -935,7 +937,7 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
ast2->frame_offset *=ast2->sample_size; ast2->frame_offset *=ast2->sample_size;
} }
if (avi->dv_demux) if (ENABLE_DV_DEMUXER && avi->dv_demux)
dv_flush_audio_packets(avi->dv_demux); dv_flush_audio_packets(avi->dv_demux);
/* do the seek */ /* do the seek */
url_fseek(&s->pb, pos, SEEK_SET); url_fseek(&s->pb, pos, SEEK_SET);