diff options
| author | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
| commit | ea7b920184a865a3343001318fc4a32dcfc7b4f5 (patch) | |
| tree | fbefd8539b77ee7473ad73740cc8ffa97bc4ffbe /TOOLS/mpv_identify.sh | |
| parent | 3dcc83a70609d392c8ecd917dd5c16995424e9c4 (diff) | |
| parent | d98e61ea438db66323734ad1b6bea66411a3c97b (diff) | |
| download | mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.bz2 mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.xz | |
Merge branch 'master' into low_quality_intel_crap
Conflicts:
video/out/gl_video_shaders.glsl
video/out/vo_opengl.c
Diffstat (limited to 'TOOLS/mpv_identify.sh')
| -rwxr-xr-x | TOOLS/mpv_identify.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/TOOLS/mpv_identify.sh b/TOOLS/mpv_identify.sh index b3bc0481ef..0c4dfc5b02 100755 --- a/TOOLS/mpv_identify.sh +++ b/TOOLS/mpv_identify.sh @@ -45,6 +45,10 @@ if [ $# -lt 2 ]; then exit 1 fi +if [ -z "$MPV" ]; then + MPV="mpv" +fi + __midentify__LF=" " @@ -86,6 +90,8 @@ __midentify__allprops=" fps width height + dwidth + dheight sub " @@ -98,7 +104,7 @@ for __midentify__key in $__midentify__allprops; do eval unset $__midentify__nextprefix$__midentify__key done -__midentify__output=`mpv --playing-msg="$__midentify__propstr" --vo=null --ao=null --frames=0 "$@"` +__midentify__output=`$MPV --playing-msg="$__midentify__propstr" --vo=null --ao=null --frames=1 --quiet "$@"` __midentify__fileindex=0 __midentify__prefix= while :; do |