summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS5
-rw-r--r--HISTORY2
-rwxr-xr-xstreamdev-server/externremux.sh2
3 files changed, 7 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2e8d5e3..aa4cab0 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -153,7 +153,10 @@ carel
for helping to find a way to cleanly shutdown externremux with mencoder
wolfi.m
- for reporting a typo in externermux quality parameter value
+ for reporting a typo in externremux quality parameter value
Norman Thiel
for reporting a wrong URL path in m3u playlists
+
+vel_tins
+ for reporting that externremux x264 uses value of ABR for VBR
diff --git a/HISTORY b/HISTORY
index 3ca77bc..2c84fa5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,8 @@
VDR Plugin 'streamdev' Revision History
---------------------------------------
+- fixed extremux x264 using value of ABR for VBR (thanks to vel_tins@vdrportal)
+
2010-07-20: Version 0.5.0b
- fixed wrong URL path in m3u playlists (reported by Norman Thiel)
diff --git a/streamdev-server/externremux.sh b/streamdev-server/externremux.sh
index 21cc60d..06c7052 100755
--- a/streamdev-server/externremux.sh
+++ b/streamdev-server/externremux.sh
@@ -101,7 +101,7 @@ function remux_mencoder
X264OPTS=(
${VOPTS}
$(hasOpt "$VOPTS" threads || echo "threads=auto")
- ${VBR:+bitrate=$ABR}
+ ${VBR:+bitrate=$VBR}
)
[ ${#X264OPTS[*]} -gt 0 ] && VOPTS=$(IFS=:; echo -x264encopts "${X264OPTS[*]}")
;;