diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-14 17:19:17 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-14 17:19:17 +0000 |
| commit | 49fb20cb8a5da4250c978bd8cea8bd841dc0594f (patch) | |
| tree | 142746aa8ae9cf412da3a61ac287c4d9deb7ca22 /libavformat/avidec.c | |
| parent | 7356aaa78626b34c3b2779c7af84c92111025ebf (diff) | |
| download | ffmpeg-49fb20cb8a5da4250c978bd8cea8bd841dc0594f.tar.gz | |
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
and remove all ENABLE_ definitions.
Originally committed as revision 16600 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avidec.c')
| -rw-r--r-- | libavformat/avidec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index c25a7941db..6997ebc3b8 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -350,7 +350,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) av_freep(&s->streams[0]->codec->extradata); av_freep(&s->streams[0]); s->nb_streams = 0; - if (ENABLE_DV_DEMUXER) { + if (CONFIG_DV_DEMUXER) { avi->dv_demux = dv_init_demux(s); if (!avi->dv_demux) goto fail; @@ -636,7 +636,7 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt) int64_t i, sync; void* dstr; - if (ENABLE_DV_DEMUXER && avi->dv_demux) { + if (CONFIG_DV_DEMUXER && avi->dv_demux) { size = dv_get_packet(avi->dv_demux, pkt); if (size >= 0) return size; @@ -721,7 +721,7 @@ resync: memcpy(pkt->data + pkt->size - 4*256, ast->pal, 4*256); } - if (ENABLE_DV_DEMUXER && avi->dv_demux) { + if (CONFIG_DV_DEMUXER && avi->dv_demux) { dstr = pkt->destruct; size = dv_produce_packet(avi->dv_demux, pkt, pkt->data, pkt->size); @@ -1012,7 +1012,7 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp // av_log(NULL, AV_LOG_DEBUG, "XX %"PRId64" %d %"PRId64"\n", timestamp, index, st->index_entries[index].timestamp); - if (ENABLE_DV_DEMUXER && avi->dv_demux) { + if (CONFIG_DV_DEMUXER && avi->dv_demux) { /* One and only one real stream for DV in AVI, and it has video */ /* offsets. Calling with other stream indexes should have failed */ /* the av_index_search_timestamp call above. */ |