diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
| commit | d5c868325cefcd5fad53361d1dfdc9757674eb70 (patch) | |
| tree | a838e509fdc2468220466e6337097b3ef590b00c /libmpdemux/demux_avs.h | |
| parent | 0cb5123c8f65b3d7715deb22ce8430eccc21996e (diff) | |
| parent | 5b3834c5d1033f05d798278c33782c5563247062 (diff) | |
| download | mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.bz2 mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.xz | |
Merge svn changes up to r26979
Most of the conflicts are trivial.
Conflicts:
Makefile
cfg-mplayer.h
input/input.c
libmenu/vf_menu.c
libmpcodecs/dec_video.c
libmpcodecs/vf_expand.c
libmpcodecs/vf_vo.c
libmpdemux/demux_mkv.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/vo_directfb2.c
libvo/vo_gl.c
libvo/vo_winvidix.c
libvo/vo_xv.c
libvo/vo_xvidix.c
libvo/vo_xvmc.c
libvo/x11_common.c
mplayer.c
osdep/timer-linux.c
stream/cache2.c
Diffstat (limited to 'libmpdemux/demux_avs.h')
| -rw-r--r-- | libmpdemux/demux_avs.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpdemux/demux_avs.h b/libmpdemux/demux_avs.h index 29526d6964..0962146281 100644 --- a/libmpdemux/demux_avs.h +++ b/libmpdemux/demux_avs.h @@ -132,15 +132,15 @@ static inline AVS_Value avs_new_value_array(AVS_Value * v0, int size) static inline int avs_is_error(AVS_Value v) { return v.type == 'e'; } static inline int avs_is_clip(AVS_Value v) { return v.type == 'c'; } static inline int avs_is_string(AVS_Value v) { return v.type == 's'; } -static inline int avs_has_video(const AVS_VideoInfo * p) { return (p->width!=0); } -static inline int avs_has_audio(const AVS_VideoInfo * p) { return (p->audio_samples_per_second!=0); } +static inline int avs_has_video(const AVS_VideoInfo * p) { return p->width != 0; } +static inline int avs_has_audio(const AVS_VideoInfo * p) { return p->audio_samples_per_second != 0; } static inline const char * avs_as_string(AVS_Value v) { return avs_is_error(v) || avs_is_string(v) ? v.d.string : 0; } /* Color spaces */ static inline int avs_is_rgb(const AVS_VideoInfo * p) -{ return (p->pixel_type&AVS_CS_BGR); } +{ return p->pixel_type & AVS_CS_BGR; } static inline int avs_is_rgb24(const AVS_VideoInfo * p) { return (p->pixel_type&AVS_CS_BGR24)==AVS_CS_BGR24; } // Clear out additional properties @@ -149,7 +149,7 @@ static inline int avs_is_rgb32(const AVS_VideoInfo * p) { return (p->pixel_type & AVS_CS_BGR32) == AVS_CS_BGR32 ; } static inline int avs_is_yuy(const AVS_VideoInfo * p) -{ return (p->pixel_type&AVS_CS_YUV ); } +{ return p->pixel_type & AVS_CS_YUV; } static inline int avs_is_yuy2(const AVS_VideoInfo * p) { return (p->pixel_type & AVS_CS_YUY2) == AVS_CS_YUY2; } |