diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
| commit | 6cce822505c0a76ac520909a895021b8f5b7e5ab (patch) | |
| tree | f8ba954c698470208a243be3da216f7f54367f46 /libmpdemux/demux_ogg.c | |
| parent | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (diff) | |
| parent | ded7033671fb7d84fbdb67ace46c1fc8833631bc (diff) | |
| download | mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.bz2 mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.xz | |
Merge svn changes up to r27399
Conflicts:
libmpcodecs/vd.c
libmpcodecs/ve_raw.c
libvo/video_out.c
libvo/x11_common.c
mplayer.c
Diffstat (limited to 'libmpdemux/demux_ogg.c')
| -rw-r--r-- | libmpdemux/demux_ogg.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 2bd996e207..fe5697fc3d 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -28,7 +28,7 @@ #include <vorbis/codec.h> #endif -#ifdef HAVE_OGGTHEORA +#ifdef CONFIG_OGGTHEORA #include <theora/theora.h> extern int _ilog (unsigned int); /* defined in many places in theora/lib/ */ #endif @@ -39,7 +39,7 @@ extern int _ilog (unsigned int); /* defined in many places in theora/lib/ */ * without using theora_granule_time with the theora_state of the stream. * This is duplicated in `vd_theora.c'; put this in a common header? */ -#ifdef HAVE_OGGTHEORA +#ifdef CONFIG_OGGTHEORA typedef struct theora_struct_st { theora_state st; theora_comment cc; @@ -196,7 +196,7 @@ void demux_ogg_add_sub (ogg_stream_t* os,ogg_packet* pack) { mp_msg(MSGT_DEMUX,MSGL_DBG2,"Ogg sub lines: %d first: '%s'\n", ogg_sub.lines, ogg_sub.text[0]); -#ifdef CONFIG_ICONV +#ifdef HAVE_ICONV subcp_recode(&ogg_sub); #endif vo_sub = &ogg_sub; @@ -266,7 +266,7 @@ static unsigned char* demux_ogg_read_packet(ogg_stream_t* os,ogg_packet* pack,fl } } else if (os->speex) { // whole packet (default) -# ifdef HAVE_OGGTHEORA +# ifdef CONFIG_OGGTHEORA } else if (os->theora) { /* we pass complete packets to theora, mustn't strip the header! */ os->lastsize = 1; @@ -292,7 +292,7 @@ static unsigned char* demux_ogg_read_packet(ogg_stream_t* os,ogg_packet* pack,fl pack->granulepos = os->lastpos; *pts = (double)os->lastpos / (double)os->samplerate; } -#endif /* HAVE_OGGTHEORA */ +#endif /* CONFIG_OGGTHEORA */ } else if (os->flac) { /* we pass complete packets to flac, mustn't strip the header! */ if (os->flac == 2 && pack->packet[0] != 0xff) @@ -745,7 +745,7 @@ int demux_ogg_open(demuxer_t* demuxer) { sh_audio_t* sh_a; sh_video_t* sh_v; -#ifdef CONFIG_ICONV +#ifdef HAVE_ICONV subcp_open(NULL); #endif @@ -838,7 +838,7 @@ int demux_ogg_open(demuxer_t* demuxer) { mp_msg(MSGT_DEMUX,MSGL_INFO,"[Ogg] stream %d: audio (Speex), -aid %d\n",ogg_d->num_sub,n_audio-1); // check for Theora -# ifdef HAVE_OGGTHEORA +# ifdef CONFIG_OGGTHEORA } else if (pack.bytes >= 7 && !strncmp (&pack.packet[1], "theora", 6)) { int errorCode = 0; theora_info inf; @@ -884,7 +884,7 @@ int demux_ogg_open(demuxer_t* demuxer) { } theora_comment_clear(&cc); theora_info_clear(&inf); -# endif /* HAVE_OGGTHEORA */ +# endif /* CONFIG_OGGTHEORA */ } 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'); @@ -1487,7 +1487,7 @@ static void demux_close_ogg(demuxer_t* demuxer) { if(!ogg_d) return; -#ifdef CONFIG_ICONV +#ifdef HAVE_ICONV subcp_close(); #endif |