summaryrefslogtreecommitdiffstats
path: root/TOOLS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-10-12 10:17:55 +0200
committerwm4 <wm4@nowhere>2012-10-12 11:53:53 +0200
commit85d185441acf4691c830db2f40235ac927410d45 (patch)
tree211177793cd5d6b399346be661af8e7528f0f411 /TOOLS
parent65fc530f0c3ff02f982a0e4c74988d4a53730f04 (diff)
parente1b15dee4c250bf6509594e241eb2856c8d21e0f (diff)
downloadmpv-85d185441acf4691c830db2f40235ac927410d45.tar.bz2
mpv-85d185441acf4691c830db2f40235ac927410d45.tar.xz
Merge branch 'input_changes' into master
Conflicts: DOCS/man/en/vo.rst etc/input.conf input/input.c m_property.c
Diffstat (limited to 'TOOLS')
-rwxr-xr-xTOOLS/mpv_identify.sh23
1 files changed, 11 insertions, 12 deletions
diff --git a/TOOLS/mpv_identify.sh b/TOOLS/mpv_identify.sh
index 49cec2ce94..d09504ab57 100755
--- a/TOOLS/mpv_identify.sh
+++ b/TOOLS/mpv_identify.sh
@@ -59,30 +59,29 @@ fi
__midentify__allprops="
filename
path
- stream_start
- stream_end
- stream_length
+ stream-start
+ stream-end
+ stream-length
demuxer
- switch_program
length
chapters
editions
titles
- switch_audio
- audio_bitrate
- audio_codec
- audio_format
+ audio
+ audio-bitrate
+ audio-codec
+ audio-format
channels
samplerate
- switch_video
+ video
angle
- video_bitrate
- video_codec
- video_format
+ video-bitrate
+ video-codec
+ video-format
aspect
fps
width