summaryrefslogtreecommitdiffstats
path: root/libvo/vo_zr.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 /libvo/vo_zr.c
parent22a06c4ae5672c1dd629918d0a279b8af24e35c3 (diff)
parent2aafb808284d74edab6e5320e1114f5c74d5881e (diff)
downloadmpv-c37f09693d0edb632c80f8f38ecdb2faf3547f7f.tar.bz2
mpv-c37f09693d0edb632c80f8f38ecdb2faf3547f7f.tar.xz
Merge svn changes up to r30643
Diffstat (limited to 'libvo/vo_zr.c')
-rw-r--r--libvo/vo_zr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/vo_zr.c b/libvo/vo_zr.c
index 9b7968a6ba..8ad201a877 100644
--- a/libvo/vo_zr.c
+++ b/libvo/vo_zr.c
@@ -41,8 +41,8 @@
#include "mp_msg.h"
#include "m_option.h"
#include "fastmemcpy.h"
-
#include "jpeg_enc.h"
+#include "vo_zr.h"
static const vo_info_t info =
{