diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-21 17:58:33 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-21 17:58:33 +0000 |
| commit | e87a925c4ae6379e4f85267d512287edeecc6dea (patch) | |
| tree | 76ba56cb24c62ca5882044908d63cd4821d8e530 /libmpdemux/demux_ogg.c | |
| parent | e9e5d67d19ed39c8f0e0ec7318c2fcfee586ae5b (diff) | |
| download | mpv-e87a925c4ae6379e4f85267d512287edeecc6dea.tar.bz2 mpv-e87a925c4ae6379e4f85267d512287edeecc6dea.tar.xz | |
Remove #ifdef HAVE_FLAC, it was never needed and nowadays is never defined.
Fixes http://samples.mplayerhq.hu/ogg/old_flac_in_ogg_flac_1_0_4.ogg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20335 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_ogg.c')
| -rw-r--r-- | libmpdemux/demux_ogg.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 039c1b4422..17001cd7e2 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -391,10 +391,8 @@ static unsigned char* demux_ogg_read_packet(ogg_stream_t* os,ogg_packet* pack,vo *pts = (double)os->lastpos / (double)os->samplerate; } #endif /* HAVE_OGGTHEORA */ -# ifdef HAVE_FLAC } else if (os->flac) { /* we pass complete packets to flac, mustn't strip the header! */ -#endif /* HAVE_FLAC */ } else { if(*pack->packet & PACKET_TYPE_HEADER) os->hdr_packets++; @@ -1003,7 +1001,6 @@ int demux_ogg_open(demuxer_t* demuxer) { if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh_v->bih,MSGL_V); } # endif /* HAVE_OGGTHEORA */ -# ifdef HAVE_FLAC } else if (pack.bytes >= 4 && !strncmp (&pack.packet[0], "fLaC", 4)) { sh_a = new_sh_audio_aid(demuxer,ogg_d->num_sub, n_audio); sh_a->format = mmioFOURCC('f', 'L', 'a', 'C'); @@ -1012,7 +1009,6 @@ int demux_ogg_open(demuxer_t* demuxer) { ogg_d->subs[ogg_d->num_sub].flac = 1; sh_a->wf = NULL; mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: audio (FLAC), -aid %d\n",ogg_d->num_sub,n_audio-1); -# endif /* HAVE_FLAC */ /// Check for old header } else if(pack.bytes >= 142 && ! strncmp(&pack.packet[1],"Direct Show Samples embedded in Ogg",35) ) { |