Fixes for MP4Box

diff --git a/encode.py b/encode.py
index 57acdfc4c641ae5d8794c01be305fafc5378a5c5..1bc6c3a3ebf4c6f1b525c2bc4a8edc7af796c249 100755 (executable)
--- a/encode.py
+++ b/encode.py
@@ -179,10 +179,11 @@ profiles = {
        Profile(
                commands=[Mencoder, MP4Box],
                vcodec="x264",
-               vopts="pass=%(vpass)d:bitrate=%(vbitrate)d:vbv_maxrate=1500:vbv_bufsize=2000:nocabac:me=umh:partitions=all:trellis=1:subq=7:bframes=0:direct_pred=auto:level_idc=30:global_header:turbo",
+               vopts="pass=%(vpass)d:bitrate=%(vbitrate)d:vbv_maxrate=1500:vbv_bufsize=2000:nocabac:me=umh:partitions=all:trellis=1:subq=7:bframes=0:direct_pred=auto:level_idc=30:turbo",
                acodec="faac",
-               aopts="br=%(abitrate)d:mpeg=4:object=2:raw",
-               extra2=["-channels", "2", "-srate", "48000"]
+               aopts="br=%(abitrate)d:mpeg=4:object=2",
+               extra=["-vf-add", "scale=480:-10"],
+               extra2=["-channels", "2", "-srate", "48000"],
        ),
 
        "nokiax264" :
@@ -193,9 +194,9 @@ profiles = {
                        "abitrate": 96,
                },
                vcodec="x264",
-               vopts="pass=%(vpass)d:bitrate=%(vbitrate)d:nocabac:me=umh:partitions=all:trellis=1:subq=7:bframes=0:direct_pred=auto:global_header",
+               vopts="pass=%(vpass)d:bitrate=%(vbitrate)d:nocabac:me=umh:partitions=all:trellis=1:subq=7:bframes=0:direct_pred=auto",
                acodec="faac",
-               aopts="br=%(abitrate)d:mpeg=4:object=2:raw",
+               aopts="br=%(abitrate)d:mpeg=4:object=2",
                extra=["-vf-add", "scale=320:-10"],
        ),
 }