thinliquidfilm/0003-Fix-change-of-motion-estimation-command-line-param.patch

   1 From 26a2c481e264edc031b0c19108a651776be06c15 Mon Sep 17 00:00:00 2001
   2 From: Gergely Imreh <imrehg@gmail.com>
   3 Date: Wed, 7 Jan 2009 16:13:31 +0800
   4 Subject: [PATCH 3/3] Fix: change of motion estimation command line param of ffmpeg
   5
   6 ---
   7  main.py |    6 +++---
   8  1 files changed, 3 insertions(+), 3 deletions(-)
   9
  10 diff --git a/main.py b/main.py
  11 index b927788..10aff83 100644
  12 --- a/main.py
  13 +++ b/main.py
  14 @@ -2699,10 +2699,10 @@ class main(QDialog):
  15                  h264_opts = '-maxrate %s -b %s -qmin 3 -qmax 5 -g 300' %(maxrate,bitrate)
  16              elif self.encodeSettings[i][3] == 'libx264':
  17                  output_raw[-1] = 'mp4'
  18 -                h264_opts = '-maxrate %s -flags +loop -cmp +chroma -partitions +parti4x4+partp4x4+partp8x8+partp8x8 -flags2 +mixed_refs -level 13 -refs 3 -subq 7 -trellis 2 -me full -g 300' %(maxrate)
  19 +                h264_opts = '-maxrate %s -flags +loop -cmp +chroma -partitions +parti4x4+partp4x4+partp8x8+partp8x8 -flags2 +mixed_refs -level 13 -refs 3 -subq 7 -trellis 2 -me_method full -g 300' %(maxrate)
  20              else:
  21                  output_raw[-1] = 'mov'
  22 -                h264_opts = '-maxrate %s -flags +loop -cmp +chroma -partitions +parti4x4+partp4x4+partp8x8+partp8x8 -flags2 +mixed_refs -level 13 -refs 3 -subq 7 -trellis 2 -me full -g 300' %(maxrate)
  23 +                h264_opts = '-maxrate %s -flags +loop -cmp +chroma -partitions +parti4x4+partp4x4+partp8x8+partp8x8 -flags2 +mixed_refs -level 13 -refs 3 -subq 7 -trellis 2 -me_method full -g 300' %(maxrate)
  24              out_file = '.'.join(output_raw)
  25              if self.encodeSettings[i][0] == '1':
  26                  ffmpegPipe = os.popen('ffmpeg -y -i "%s" -vcodec %s %s -acodec libfaac -ab %s -ar 48000 -ac 2 -s %s "%s" &> %s' %(self.file_paths[i],self.encodeSettings[i][3],h264_opts,self.encodeSettings[i][4],self.encodeSettings[i][1][self.encodeSettings[i][2]],self.encodeSettings[i][5] + '/' + out_file, logfile))
  27 @@ -3520,7 +3520,7 @@ class main(QDialog):
  28              h264_opts = '-maxrate %s -b %s -qmin 3 -qmax 5 -g 300' %(maxrate,bitrate)
  29          else:
  30              out_file = self.config_directory + '/preview.mov'
  31 -            h264_opts = '-maxrate %s -flags +loop -cmp +chroma -partitions +parti4x4+partp4x4+partp8x8+partp8x8 -flags2 +mixed_refs -level 13 -refs 3 -subq 7 -trellis 2 -me full -g 300' %(maxrate)
  32 +            h264_opts = '-maxrate %s -flags +loop -cmp +chroma -partitions +parti4x4+partp4x4+partp8x8+partp8x8 -flags2 +mixed_refs -level 13 -refs 3 -subq 7 -trellis 2 -me_method full -g 300' %(maxrate)
  33          if self.encodeSettings[i][0] == '1':
  34              os.system('ffmpeg -y -i "%s" -vframes %s -vcodec %s %s -acodec aac -ab %s -ar 48000 -ac 2 -s %s "%s" &> %s' %(self.file_paths[i],vframes,self.encodeSettings[i][3],h264_opts,self.encodeSettings[i][4],self.encodeSettings[i][1][self.encodeSettings[i][2]], out_file, logfile))
  35          else:
  36 --
  37 1.6.1
  38