summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-07-30 12:01:30 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-07-30 12:01:30 +0000
commit4b141479da70665db8d5780c9ca9e430c9dd1f09 (patch)
tree9f61bb3b6989d4049f57a4d360d9e9b4d0047e9d /libmpdemux/demuxer.c
parentcbe1fcbf8309755549d01cec871c84316432ab8c (diff)
downloadmpv-4b141479da70665db8d5780c9ca9e430c9dd1f09.tar.bz2
mpv-4b141479da70665db8d5780c9ca9e430c9dd1f09.tar.xz
Start unifying names of internal preprocessor directives.
Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 6d51b434e8..8d5eb86ab4 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -22,12 +22,12 @@
#include "libaf/af_format.h"
-#ifdef USE_ASS
+#ifdef CONFIG_ASS
#include "libass/ass.h"
#include "libass/ass_mp.h"
#endif
-#ifdef USE_LIBAVCODEC
+#ifdef CONFIG_LIBAVCODEC
#include "libavcodec/avcodec.h"
#if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE
#error MP_INPUT_BUFFER_PADDING_SIZE is too small!
@@ -88,11 +88,11 @@ extern const demuxer_desc_t demuxer_desc_nut;
const demuxer_desc_t *const demuxer_list[] = {
&demuxer_desc_rawaudio,
&demuxer_desc_rawvideo,
-#ifdef USE_TV
+#ifdef CONFIG_TV
&demuxer_desc_tv,
#endif
&demuxer_desc_mf,
-#ifdef USE_LIBAVFORMAT
+#ifdef CONFIG_LIBAVFORMAT
&demuxer_desc_lavf_preferred,
#endif
&demuxer_desc_avi,
@@ -116,7 +116,7 @@ const demuxer_desc_t *const demuxer_list[] = {
#ifdef HAVE_OGGVORBIS
&demuxer_desc_ogg,
#endif
-#ifdef USE_WIN32DLL
+#ifdef CONFIG_WIN32DLL
&demuxer_desc_avs,
#endif
&demuxer_desc_pva,
@@ -136,7 +136,7 @@ const demuxer_desc_t *const demuxer_list[] = {
#ifdef LIBNEMESI
&demuxer_desc_rtp_nemesi,
#endif
-#ifdef USE_LIBAVFORMAT
+#ifdef CONFIG_LIBAVFORMAT
&demuxer_desc_lavf,
#endif
#ifdef MUSEPACK
@@ -264,7 +264,7 @@ void free_sh_sub(sh_sub_t *sh)
{
mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_sub at %p\n", sh);
free(sh->extradata);
-#ifdef USE_ASS
+#ifdef CONFIG_ASS
if (sh->ass_track)
ass_free_track(sh->ass_track);
#endif
@@ -906,7 +906,7 @@ static demuxer_t *demux_open_stream(stream_t *stream, int file_format,
sh_video->fps, sh_video->i_bps * 0.008f,
sh_video->i_bps / 1024.0f);
}
-#ifdef USE_ASS
+#ifdef CONFIG_ASS
if (ass_enabled && ass_library) {
for (i = 0; i < MAX_S_STREAMS; ++i) {
sh_sub_t *sh = demuxer->s_streams[i];
@@ -1066,7 +1066,7 @@ int demux_seek(demuxer_t *demuxer, float rel_seek_secs, float audio_delay,
if (!demuxer->seekable) {
if (demuxer->file_format == DEMUXER_TYPE_AVI)
mp_msg(MSGT_SEEK, MSGL_WARN, MSGTR_CantSeekRawAVI);
-#ifdef USE_TV
+#ifdef CONFIG_TV
else if (demuxer->file_format == DEMUXER_TYPE_TV)
mp_msg(MSGT_SEEK, MSGL_WARN, MSGTR_TVInputNotSeekable);
#endif