Mercurial > mplayer.hg

comparison libmpdemux/demux_avi.c @ 27363:40057010b1fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change a bunch of codec-specific preprocessor directives from a HAVE_ prefix to a CONFIG_ prefix.
author diego
date Sat, 02 Aug 2008 16:30:32 +0000
parents f85dc2a992c3
children 9e739bdb049c
comparison
equal deleted inserted replaced
27362:9020d4c7bd32 27363:40057010b1fa
826 826
827 demuxer = demux_open_avi(demuxer); 827 demuxer = demux_open_avi(demuxer);
828 if(!demuxer) return NULL; // failed to open 828 if(!demuxer) return NULL; // failed to open
829 sh_a = demuxer->audio->sh; 829 sh_a = demuxer->audio->sh;
830 if(demuxer->audio->id != -2 && sh_a) { 830 if(demuxer->audio->id != -2 && sh_a) {
831 #ifdef HAVE_OGGVORBIS 831 #ifdef CONFIG_OGGVORBIS
832 // support for Ogg-in-AVI: 832 // support for Ogg-in-AVI:
833 if(sh_a->format == 0xFFFE) 833 if(sh_a->format == 0xFFFE)
834 demuxer = init_avi_with_ogg(demuxer); 834 demuxer = init_avi_with_ogg(demuxer);
835 else if(sh_a->format == 0x674F) { 835 else if(sh_a->format == 0x674F) {
836 stream_t* s; 836 stream_t* s;