diff options
| author | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-04-25 18:28:17 +0900 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-04-25 18:28:17 +0900 |
| commit | 5f1d6b6e5ae515abfb77c78c44d21ee21beb0fc3 (patch) | |
| tree | 6b757d37d296709dfd5955ef9d4d41426cd47da6 /video/decode/dec_video.c | |
| parent | d64ff3aa51b49451348383a6ff6de7697a52dc62 (diff) | |
| parent | 983d24e3b9ce9c9c7755279138c14170e85fbf37 (diff) | |
| download | mpv-5f1d6b6e5ae515abfb77c78c44d21ee21beb0fc3.tar.bz2 mpv-5f1d6b6e5ae515abfb77c78c44d21ee21beb0fc3.tar.xz | |
Merge branch 'master' into release/0.9
* master: (87 commits)
manpage: move --autosync description
player: add --window-scale option
player: flush decoder even if cover art is decoded
player: don't show A/V desync message in non-sense situations
w32_common: add more rounded-down frame rates
w32_common: use the current monitor's refresh rate
dxva2: fix broken build with gcc 5.1
terminal: printf() is not signal-safe
man: fix PDF build
DOCS/mplayer-changes: Eleborate on joystick input
osc: add nil check for element.eventresponder
mp_image: remove some unused interlacing flags
vf_vapoursynth: update _FieldBased semantics
options: remove unneeded hack from command line parser
manpage: document ff-index sub-property
demux_mkv: limit timestamp fixing to 1ms max
demux_mkv: attempt to fix rounded timestamps
demux_mkv: move global options to the demuxer
demux_mkv: better seeking after video end
lua: add utils.format_json() function
...
Diffstat (limited to 'video/decode/dec_video.c')
| -rw-r--r-- | video/decode/dec_video.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c index afbda5142f..0c733b0aa6 100644 --- a/video/decode/dec_video.c +++ b/video/decode/dec_video.c @@ -385,13 +385,6 @@ int video_reconfig_filters(struct dec_video *d_video, struct mp_image_params p = *params; struct sh_video *sh = d_video->header->video; - MP_VERBOSE(d_video, "VIDEO: %dx%d %5.3f fps %5.1f kbps (%4.1f kB/s)\n", - p.w, p.h, sh->fps, sh->bitrate / 1000.0, - sh->bitrate / 8000.0); - - MP_VERBOSE(d_video, "VDec: vo config request - %d x %d (%s)\n", - p.w, p.h, vo_format_name(p.imgfmt)); - float decoder_aspect = p.d_w / (float)p.d_h; if (d_video->initial_decoder_aspect == 0) d_video->initial_decoder_aspect = decoder_aspect; @@ -414,10 +407,6 @@ int video_reconfig_filters(struct dec_video *d_video, // Detect colorspace from resolution. mp_image_params_guess_csp(&p); - // Time to config libvo! - MP_VERBOSE(d_video, "VO Config (%dx%d->%dx%d,0x%X)\n", - p.w, p.h, p.d_w, p.d_h, p.imgfmt); - if (vf_reconfig(d_video->vfilter, params, &p) < 0) { MP_FATAL(d_video, "Cannot initialize video filters.\n"); return -1; |