RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vd: remove some dead code 

As of now, this function is called only after decoding a full, valid
video frame, so the image parameters should be reliable.
This commit is contained in:
wm4 2013-09-26 15:54:58 +02:00
parent 0a0d7f43a5
commit 7eb13c4028
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
video/decode/vd.c
View File

@ -58,24 +58,14 @@ int mpcodecs_reconfig_vo(sh_video_t *sh, const struct mp_image_params *params)
sh->vf_reconfig_count++;
if (!p.w || !p.h) {
// ideally, this should be dead code
mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Unknown size, using container size.\n");
p.w = sh->disp_w;
p.h = sh->disp_h;
} else {
sh->disp_w = p.w;
sh->disp_h = p.h;
}
sh->disp_w = p.w;
sh->disp_h = p.h;
mp_msg(MSGT_DECVIDEO, MSGL_V,
"VIDEO: %dx%d %5.3f fps %5.1f kbps (%4.1f kB/s)\n",
sh->disp_w, sh->disp_h, sh->fps, sh->i_bps * 0.008,
sh->i_bps / 1000.0);
if (!sh->disp_w || !sh->disp_h)
return -1;
mp_msg(MSGT_DECVIDEO, MSGL_V, "VDec: vo config request - %d x %d (%s)\n",
p.w, p.h, vo_format_name(p.imgfmt));
@ -130,8 +120,8 @@ int mpcodecs_reconfig_vo(sh_video_t *sh, const struct mp_image_params *params)
else if (sh->stream_aspect != 0.0)
sh->aspect = sh->stream_aspect;
int d_w = sh->disp_w;
int d_h = sh->disp_h;
int d_w = p.w;
int d_h = p.h;
if (sh->aspect > 0.01) {
int new_w = d_h * sh->aspect;