diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
| commit | 13221a716588dc88c1151e0a0f8eb7cce41d461c (patch) | |
| tree | 3184184f1e984d248e2570ffa05c79589d2c9a1c /libmpcodecs/vf_zrmjpeg.c | |
| parent | c4f7b9666f753b320157e6497f9114523878885f (diff) | |
| parent | bb54613ac1211c73a3614db6b7326d7cd9be39da (diff) | |
| download | mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.bz2 mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.xz | |
Merge svn changes up to r30663
Conflicts:
gui/cfg.c
libmpcodecs/vd_dmo.c
mplayer.c
Diffstat (limited to 'libmpcodecs/vf_zrmjpeg.c')
| -rw-r--r-- | libmpcodecs/vf_zrmjpeg.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libmpcodecs/vf_zrmjpeg.c b/libmpcodecs/vf_zrmjpeg.c index 87c50351d9..31f51e7765 100644 --- a/libmpcodecs/vf_zrmjpeg.c +++ b/libmpcodecs/vf_zrmjpeg.c @@ -50,7 +50,6 @@ #define HAVE_AV_CONFIG_H #include "libavcodec/avcodec.h" #include "libavcodec/mjpegenc.h" -//#include "jpeg_enc.h" /* this file is not present yet */ #undef malloc #undef free |