diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:37:00 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:37:00 +0200 |
| commit | 42bf12c2d3b2903a127f625dea0d3516a87debfa (patch) | |
| tree | 7fe1a2c4a3c250d44b9ff2a8bdf3809104744eb9 /libmpcodecs/ad_libdv.c | |
| parent | fa34ea27b94cd870ec56de4ce215bf797054119f (diff) | |
| parent | 3c514ea708749679623ae04fc8f7ade87e51aade (diff) | |
| download | mpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.bz2 mpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.xz | |
Merge svn changes up to r30595
Conflicts:
mplayer.c
vidix/nvidia_vid.c
Diffstat (limited to 'libmpcodecs/ad_libdv.c')
| -rw-r--r-- | libmpcodecs/ad_libdv.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libmpcodecs/ad_libdv.c b/libmpcodecs/ad_libdv.c index 384627462d..c4b30a747d 100644 --- a/libmpcodecs/ad_libdv.c +++ b/libmpcodecs/ad_libdv.c @@ -37,6 +37,7 @@ #include "libmpdemux/stheader.h" #include "ad_internal.h" +#include "vd_libdv.h" static const ad_info_t info = { @@ -49,9 +50,6 @@ static const ad_info_t info = LIBAD_EXTERN(libdv) -// defined in vd_libdv.c: -dv_decoder_t* init_global_rawdv_decoder(void); - static int preinit(sh_audio_t *sh_audio) { sh_audio->audio_out_minsize=4*DV_AUDIO_MAX_SAMPLES*2; |