diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-08-09 00:10:48 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-08-09 00:10:48 (GMT) |
| commit | eb79c361fd072b1b5a7529f6694f5050d8373c3f (patch) | |
| tree | ca77d6c7972a868dcb34f738f4b8870d564e02e7 /abs/core/linhes-scripts/myth2mkv | |
| parent | 15699db7cc8429c3f9d7a2b516b91889e010984d (diff) | |
| parent | 90514910be147bd0aa416dc29ab4cb0791844cc4 (diff) | |
| download | linhes_pkgbuild-eb79c361fd072b1b5a7529f6694f5050d8373c3f.zip linhes_pkgbuild-eb79c361fd072b1b5a7529f6694f5050d8373c3f.tar.gz linhes_pkgbuild-eb79c361fd072b1b5a7529f6694f5050d8373c3f.tar.bz2 | |
Merge remote-tracking branch 'origin/testing' into testing
# By Cecil (8) and Michael Hanson (4)
# Via Cecil (2) and Michael Hanson (1)
* origin/testing:
mplayer: nothing to see here
bluez: update to 4.101
linhes-scripts:Corrected scripting errors in ripD_eject.sh.
linhes-scripts:Modifed ripD_eject.sh to use HandBrakeCLI.
mplayer: minor correction to PKGBUILD. No pkg built.
handbrake:Bumped to 0.9.8. Closes #838.
mythtv:Bumped to add deps for backing up DVD.
mythtv:Bumped to compiles latest 0.25.2. Added DVD backup menu.
mythplugins:Bumped to compiles latest 0.25.2.
linhes-scripts:Added scripts to backup one's DVD.
lsdvd:initial inclusion. For use with ripD.
linhes-scripts: fix for myth2mkv
Conflicts:
abs/core/mplayer/PKGBUILD
abs/core/mythtv/stable-0.25/git_src/git_hash
abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
Diffstat (limited to 'abs/core/linhes-scripts/myth2mkv')
| -rw-r--r-- | abs/core/linhes-scripts/myth2mkv | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/abs/core/linhes-scripts/myth2mkv b/abs/core/linhes-scripts/myth2mkv index 5035748..f180b31 100644 --- a/abs/core/linhes-scripts/myth2mkv +++ b/abs/core/linhes-scripts/myth2mkv @@ -2,7 +2,7 @@ # # Convert video to AVC-1 / h264 # -# version 0.25-001 +# version 0.25-002 # # Prerequisites: # - mythtv >= 0.25 @@ -156,6 +156,11 @@ if [[ ${FPS} = "29.970" ]] ; then FPS="29.97" fi +# HandBrake does not like a framerate of 59.940, so let's drop the 0 +if [[ ${FPS} = "59.940" ]] ; then + FPS="59.94" +fi + # A rough guestimation that if the video width is 1920, 1440, 852, 704, 640 or # 528 pixels it is probably interlaced. if [[ ${DEINT} = Y ]] ; then |