diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:04:43 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:13:09 +0300 |
| commit | 17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch) | |
| tree | 5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 /libmpdemux/video.c | |
| parent | 2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff) | |
| parent | af76be6e197382af491fadef3fcf821a721c99f5 (diff) | |
| download | mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.bz2 mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.xz | |
Merge svn changes up to r27441
Conflicts:
cfg-common-opts.h
command.c
configure
input/input.c
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpdemux/stheader.h
libvo/sub.c
libvo/video_out.c
libvo/vo_xv.c
libvo/vosub_vidix.c
libvo/x11_common.c
libvo/x11_common.h
mp_core.h
mplayer.c
stream/stream.h
Diffstat (limited to 'libmpdemux/video.c')
| -rw-r--r-- | libmpdemux/video.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 95348a8efa..0e7dfe618c 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -25,7 +25,7 @@ /* biCompression constant */ #define BI_RGB 0L -#ifdef STREAMING_LIVE555 +#ifdef CONFIG_LIVE555 #include "demux_rtp.h" #endif @@ -57,7 +57,7 @@ static video_codec_t find_video_codec(sh_video_t *sh_video) ((! sh_video->format) || (sh_video->format==0x10000001) || (sh_video->format==0x10000002)) ) || (fmt == DEMUXER_TYPE_MPEG_TY) -#ifdef STREAMING_LIVE555 +#ifdef CONFIG_LIVE555 || ((fmt == DEMUXER_TYPE_RTP) && demux_is_mpeg_rtp_stream(d_video->demuxer)) #endif ) |