Mercurial > mplayer.hg
changeset 20329:a0919fb6bfaf
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
| author | reimar |
|---|---|
| date | Sat, 21 Oct 2006 17:58:33 +0000 |
| parents | 5d9f47834495 |
| children | 5365c8db09d7 |
| files | libmpdemux/demux_ogg.c |
| diffstat | 1 files changed, 0 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_ogg.c Sat Oct 21 17:01:45 2006 +0000 +++ b/libmpdemux/demux_ogg.c Sat Oct 21 17:58:33 2006 +0000 @@ -391,10 +391,8 @@ *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 @@ 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 @@ 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) ) {