summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vd_libdv.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 23:37:00 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 23:37:00 +0200
commit42bf12c2d3b2903a127f625dea0d3516a87debfa (patch)
tree7fe1a2c4a3c250d44b9ff2a8bdf3809104744eb9 /libmpcodecs/vd_libdv.c
parentfa34ea27b94cd870ec56de4ce215bf797054119f (diff)
parent3c514ea708749679623ae04fc8f7ade87e51aade (diff)
downloadmpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.bz2
mpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.xz
Merge svn changes up to r30595
Conflicts: mplayer.c vidix/nvidia_vid.c
Diffstat (limited to 'libmpcodecs/vd_libdv.c')
-rw-r--r--libmpcodecs/vd_libdv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libmpcodecs/vd_libdv.c b/libmpcodecs/vd_libdv.c
index 02d7e2fc54..137fa7bf60 100644
--- a/libmpcodecs/vd_libdv.c
+++ b/libmpcodecs/vd_libdv.c
@@ -35,6 +35,7 @@
#include "libmpdemux/stheader.h"
#include "vd_internal.h"
+#include "vd_libdv.h"
static const vd_info_t info =
{