diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:09:46 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:09:46 +0200 |
| commit | 8365d174b69518f0acbc6540bd2bb817490e13f4 (patch) | |
| tree | fc86d4ba642e9e83b0d05b942b366cc540c4395b /libmpcodecs | |
| parent | 7fc3bb2a88dd5603b92a912fd34f834813381941 (diff) | |
| parent | 3e5d40ff2e9a45cb4f55f23b787f32bf359bd3d5 (diff) | |
| download | mpv-8365d174b69518f0acbc6540bd2bb817490e13f4.tar.bz2 mpv-8365d174b69518f0acbc6540bd2bb817490e13f4.tar.xz | |
Merge svn changes up to r30557
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_theora.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vf_eq2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/vd_theora.c b/libmpcodecs/vd_theora.c index df4968cd1f..3bf7ab83b9 100644 --- a/libmpcodecs/vd_theora.c +++ b/libmpcodecs/vd_theora.c @@ -45,7 +45,7 @@ LIBVD_EXTERN(theora) static int control(sh_video_t *sh,int cmd,void* arg,...){ switch(cmd) { case VDCTRL_QUERY_FORMAT: - if ((*((int*)arg)) == IMGFMT_YV12) + if (*(int*)arg == IMGFMT_YV12) return CONTROL_TRUE; return CONTROL_FALSE; } diff --git a/libmpcodecs/vf_eq2.c b/libmpcodecs/vf_eq2.c index 32048ec6d2..45d3f61b0b 100644 --- a/libmpcodecs/vf_eq2.c +++ b/libmpcodecs/vf_eq2.c @@ -5,7 +5,7 @@ * Daniel Moreno <comac@comac.darktech.org> (saturation, R/G/B gamma support) * Richard Felker (original MMX contrast/brightness code (vf_eq.c)) * Michael Niedermayer <michalni@gmx.at> (LUT16) -/* + * * This file is part of MPlayer. * * MPlayer is free software; you can redistribute it and/or modify |