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
  ...

1 files changed, 1 insertions, 6 deletions

diff --git a/video/filter/vf_crop.c b/video/filter/vf_crop.c
index 498b2a9037..02787b8f22 100644
--- a/video/filter/vf_crop.c
+++ b/video/filter/vf_crop.c
@@ -58,7 +58,7 @@ static int config(struct vf_instance *vf,
     // check:
     if(vf->priv->crop_w+vf->priv->crop_x>width ||
        vf->priv->crop_h+vf->priv->crop_y>height){
-        MP_WARN(vf, "[CROP] Bad position/width/height - cropped area outside of the original!\n");
+        MP_WARN(vf, "Bad position/width/height - cropped area outside of the original!\n");
         return 0;
     }
     vf_rescale_dsize(&d_width, &d_height, width, height,
@@ -85,11 +85,6 @@ static int vf_open(vf_instance_t *vf){
     vf->config=config;
     vf->filter=filter;
     vf->query_format=query_format;
-    MP_INFO(vf, "Crop: %d x %d, %d ; %d\n",
-    vf->priv->crop_w,
-    vf->priv->crop_h,
-    vf->priv->crop_x,
-    vf->priv->crop_y);
     return 1;
 }