summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2011-03-11 22:40:30 +0000
committerjstebbins <[email protected]>2011-03-11 22:40:30 +0000
commitd68cb8a25201663f832307990b2a98cc60d8ab14 (patch)
tree936279196cd07e6d68b19b6a79de61ec1e6acfbe /scripts
parent4aaed20c697c1a7e8fe7e039cf1949a320758286 (diff)
Add parameter parsing and b-frame support to ffmpeg mpeg-4 encoder
The cli will now accept ':' separated parameters using the '-x' option for ffmpeg mpeg-4. The linux gui has an entry box on the advanced tab to add options. The option keys and values are the same as what the ffmpeg command line allows. Calculation of DTS timestamps was added to encavcodec.c in order to allow out of order b-frames. The algorithm is similar to what x264 uses. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3839 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/manicure.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/manicure.rb b/scripts/manicure.rb
index f458aec1d..5ca5b8b26 100755
--- a/scripts/manicure.rb
+++ b/scripts/manicure.rb
@@ -483,7 +483,7 @@ class Display
if hash["VideoTwoPass"] == 1 then commandString << " -2" end
if hash["VideoTurboTwoPass"] == 1 then commandString << " -T" end
- #x264 Options
+ #Advanced Options
if hash["x264Option"] != ""
commandString << " -x "
commandString << hash["x264Option"]
@@ -731,7 +731,7 @@ class Display
if hash["VideoTwoPass"] == 1 then commandString << " -2" end
if hash["VideoTurboTwoPass"] == 1 then commandString << " -T" end
- #x264 Options
+ #Advanced Options
if hash["x264Option"] != ""
commandString << " -x "
commandString << hash["x264Option"]
@@ -938,11 +938,11 @@ class Display
end
end
- #x264 Options
+ #Advanced Options
if hash["x264Option"] != ""
- commandString << "if( !x264opts )\n "
+ commandString << "if( !advanced_opts )\n "
commandString << "{\n "
- commandString << " x264opts = strdup(\""
+ commandString << " advanced_opts = strdup(\""
commandString << hash["x264Option"] << "\");\n "
commandString << "}\n "
end
@@ -1256,7 +1256,7 @@ class Display
if hash["VideoTwoPass"] == 1 then commandString << " -2" end
if hash["VideoTurboTwoPass"] == 1 then commandString << " -T" end
- #x264 Options
+ #Advanced Options
if hash["x264Option"] != ""
commandString << " -x "
commandString << hash["x264Option"]