summaryrefslogtreecommitdiffstats
path: root/libvo/vo_mpegpes.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-08-08 02:04:43 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-08-08 02:13:09 +0300
commit17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch)
tree5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 /libvo/vo_mpegpes.c
parent2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff)
parentaf76be6e197382af491fadef3fcf821a721c99f5 (diff)
downloadmpv-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 'libvo/vo_mpegpes.c')
-rw-r--r--libvo/vo_mpegpes.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/libvo/vo_mpegpes.c b/libvo/vo_mpegpes.c
index 27f002e693..6499326189 100644
--- a/libvo/vo_mpegpes.c
+++ b/libvo/vo_mpegpes.c
@@ -23,9 +23,7 @@
#include <unistd.h>
#include "mp_msg.h"
-#ifdef HAVE_DVB_HEAD
-#define HAVE_DVB 1
-#endif
+
#ifdef HAVE_DVB
#ifndef HAVE_DVB_HEAD
#include <sys/poll.h>
@@ -67,9 +65,9 @@ extern int vo_mpegpes_fd2;
static const vo_info_t info =
{
#ifdef HAVE_DVB
- "Mpeg-PES to DVB card",
+ "MPEG-PES to DVB card",
#else
- "Mpeg-PES file",
+ "MPEG-PES file",
#endif
"mpegpes",
"A'rpi",