summaryrefslogtreecommitdiffstats
path: root/libmpdemux/video.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 00:00:06 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 00:00:06 +0200
commitc37f09693d0edb632c80f8f38ecdb2faf3547f7f (patch)
tree44df07eacb522a97bbecd7a3a0f93e8d6a933003 /libmpdemux/video.c
parent22a06c4ae5672c1dd629918d0a279b8af24e35c3 (diff)
parent2aafb808284d74edab6e5320e1114f5c74d5881e (diff)
downloadmpv-c37f09693d0edb632c80f8f38ecdb2faf3547f7f.tar.bz2
mpv-c37f09693d0edb632c80f8f38ecdb2faf3547f7f.tar.xz
Merge svn changes up to r30643
Diffstat (limited to 'libmpdemux/video.c')
-rw-r--r--libmpdemux/video.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c
index ff6bbd0bc9..7ba2e8049f 100644
--- a/libmpdemux/video.c
+++ b/libmpdemux/video.c
@@ -33,6 +33,7 @@
#include "stream/stream.h"
#include "demuxer.h"
+#include "demux_ty_osd.h"
#include "stheader.h"
#include "parse_es.h"
#include "mpeg_hdr.h"
@@ -405,8 +406,6 @@ mpeg_header_parser:
return 1;
}
-void ty_processuserdata( unsigned char* buf, int len );
-
static void process_userdata(unsigned char* buf,int len){
int i;
/* if the user data starts with "CC", assume it is a CC info packet */