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 /vidix/drivers.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 'vidix/drivers.c')
| -rw-r--r-- | vidix/drivers.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vidix/drivers.c b/vidix/drivers.c index 559dee30e0..7968156662 100644 --- a/vidix/drivers.c +++ b/vidix/drivers.c @@ -27,6 +27,7 @@ #include "drivers.h" #include "config.h" #include "vidix.h" +#include "drivers.h" #include "libavutil/common.h" #include "mpbswap.h" #include "config.h" |