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 /libmpcodecs/vd_xvid4.c | |
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 'libmpcodecs/vd_xvid4.c')
-rw-r--r-- | libmpcodecs/vd_xvid4.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libmpcodecs/vd_xvid4.c b/libmpcodecs/vd_xvid4.c index e7e39496f2..54d3a2a563 100644 --- a/libmpcodecs/vd_xvid4.c +++ b/libmpcodecs/vd_xvid4.c @@ -86,7 +86,7 @@ static float stats2aspect(xvid_dec_stats_t *stats); static int control(sh_video_t *sh,int cmd,void* arg,...) { - return(CONTROL_UNKNOWN); + return CONTROL_UNKNOWN; } /*============================================================================ @@ -144,7 +144,7 @@ static int init(sh_video_t *sh) default: mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Unsupported out_fmt: 0x%X\n", sh->codec->outfmt[sh->outfmtidx]); - return(0); + return 0; } /* Gather some information about the host library */ @@ -160,7 +160,7 @@ static int init(sh_video_t *sh) /* Initialize the xvidcore library */ if(xvid_global(NULL, XVID_GBL_INIT, &xvid_ini, NULL)) - return(0); + return 0; /* We use 0 width and height so xvidcore will resize its buffers * if required. That allows this vd plugin to do resize on first @@ -171,7 +171,7 @@ static int init(sh_video_t *sh) /* Get a decoder instance */ if(xvid_decore(0, XVID_DEC_CREATE, &dec_p, NULL)<0) { mp_msg(MSGT_DECVIDEO, MSGL_ERR, "XviD init failed\n"); - return(0); + return 0; } p = malloc(sizeof(priv_t)); @@ -192,7 +192,7 @@ static int init(sh_video_t *sh) break; } - return(1); + return 1; } /*============================================================================ @@ -221,7 +221,7 @@ static mp_image_t* decode(sh_video_t *sh, void* data, int len, int flags) if(!data || len <= 0) - return(NULL); + return NULL; memset(&dec,0,sizeof(xvid_dec_frame_t)); memset(&stats, 0, sizeof(xvid_dec_stats_t)); @@ -272,7 +272,7 @@ static mp_image_t* decode(sh_video_t *sh, void* data, int len, int flags) consumed = xvid_decore(p->hdl, XVID_DEC_DECODE, &dec, &stats); if (consumed < 0) { mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Decoding error\n"); - return(NULL); + return NULL; } /* Found a VOL information stats, if VO plugin is not initialized @@ -280,7 +280,7 @@ static mp_image_t* decode(sh_video_t *sh, void* data, int len, int flags) if (stats.type == XVID_TYPE_VOL && !p->vo_initialized) { sh->aspect = stats2aspect(&stats); if(!mpcodecs_config_vo(sh, stats.data.vol.width, stats.data.vol.height, IMGFMT_YV12)) - return(NULL); + return NULL; /* Don't take this path twice */ p->vo_initialized = !p->vo_initialized; @@ -309,7 +309,7 @@ static mp_image_t* decode(sh_video_t *sh, void* data, int len, int flags) /* If we got out the decoding loop because the buffer was empty and there was nothing * to output yet, then just return NULL */ - return((stats.type == XVID_TYPE_NOTHING)? NULL: mpi); + return (stats.type == XVID_TYPE_NOTHING) ? NULL : mpi; } /***************************************************************************** @@ -368,10 +368,10 @@ static float stats2aspect(xvid_dec_stats_t *stats) dar = ((float)stats->data.vol.width*wpar); dar /= ((float)stats->data.vol.height*hpar); - return(dar); + return dar; } - return(0.0f); + return 0.0f; } /***************************************************************************** |