Mercurial > mplayer.hg
changeset 31989:e648473842bd
cosmetics: Repair some of the damage that 'indent' caused.
author | diego |
---|---|
date | Wed, 08 Sep 2010 17:48:42 +0000 |
parents | 539f2f00296a |
children | 4111548d28f9 |
files | libmpcodecs/dec_video.c |
diffstat | 1 files changed, 16 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/dec_video.c Wed Sep 08 17:47:54 2010 +0000 +++ b/libmpcodecs/dec_video.c Wed Sep 08 17:48:42 2010 +0000 @@ -98,7 +98,7 @@ vf_instance_t *vf = sh_video->vfilter; vf_equalizer_t data; - data.item = item; + data.item = item; data.value = value; mp_dbg(MSGT_DECVIDEO, MSGL_V, "set video colors %s=%d \n", item, value); @@ -109,9 +109,8 @@ } /* try software control */ if (mpvdec) - if (mpvdec->control - (sh_video, VDCTRL_SET_EQUALIZER, item, (int *) value) - == CONTROL_OK) + if (mpvdec->control(sh_video, VDCTRL_SET_EQUALIZER, item, + (int *) value) == CONTROL_OK) return 1; mp_msg(MSGT_DECVIDEO, MSGL_V, MSGTR_VideoAttributeNotSupportedByVO_VD, item); @@ -155,10 +154,10 @@ void resync_video_stream(sh_video_t *sh_video) { - sh_video->timer = 0; - sh_video->next_frame_time = 0; + sh_video->timer = 0; + sh_video->next_frame_time = 0; sh_video->num_buffered_pts = 0; - sh_video->last_pts = MP_NOPTS_VALUE; + sh_video->last_pts = MP_NOPTS_VALUE; if (mpvdec) mpvdec->control(sh_video, VDCTRL_RESYNC_STREAM, NULL); } @@ -207,8 +206,7 @@ int status, stringset_t *selected) { int force = 0; - unsigned int orig_fourcc = - sh_video->bih ? sh_video->bih->biCompression : 0; + unsigned int orig_fourcc = sh_video->bih ? sh_video->bih->biCompression : 0; sh_video->codec = NULL; sh_video->vf_initialized = 0; if (codecname && codecname[0] == '+') { @@ -222,13 +220,10 @@ // restore original fourcc: if (sh_video->bih) sh_video->bih->biCompression = orig_fourcc; - if (! - (sh_video->codec = - find_video_codec(sh_video->format, - sh_video-> - bih ? ((unsigned int *) &sh_video->bih-> - biCompression) : NULL, sh_video->codec, - force))) + if (!(sh_video->codec = + find_video_codec(sh_video->format, + sh_video->bih ? ((unsigned int *) &sh_video->bih->biCompression) : NULL, + sh_video->codec, force))) break; // ok we found one codec if (stringset_test(selected, sh_video->codec->name)) @@ -256,8 +251,8 @@ vd_functions_t *funcs_sym; vd_info_t *info_sym; - buf_len = - strlen(MPLAYER_LIBDIR) + strlen(sh_video->codec->drv) + 16; + buf_len = strlen(MPLAYER_LIBDIR) + + strlen(sh_video->codec->drv) + 16; buf = malloc(buf_len); if (!buf) break; @@ -290,7 +285,7 @@ sh_video->codec->name, sh_video->codec->drv); continue; } - orig_w = sh_video->bih ? sh_video->bih->biWidth : sh_video->disp_w; + orig_w = sh_video->bih ? sh_video->bih->biWidth : sh_video->disp_w; orig_h = sh_video->bih ? sh_video->bih->biHeight : sh_video->disp_h; sh_video->disp_w = orig_w; sh_video->disp_h = orig_h; @@ -301,7 +296,7 @@ sh_video->disp_h = (sh_video->disp_h + 15) & (~15); } if (sh_video->bih) { - sh_video->bih->biWidth = sh_video->disp_w; + sh_video->bih->biWidth = sh_video->disp_w; sh_video->bih->biHeight = sh_video->disp_h; } // init() @@ -315,7 +310,7 @@ sh_video->disp_w = orig_w; sh_video->disp_h = orig_h; if (sh_video->bih) { - sh_video->bih->biWidth = sh_video->disp_w; + sh_video->bih->biWidth = sh_video->disp_w; sh_video->bih->biHeight = sh_video->disp_h; } continue; // try next...