Changeset a1e71c3240d1a9db343a7a25b7f71146ea1115ef

Show
Ignore:
Timestamp:
02/07/08 17:11:44 (1 year ago)
Author:
wgw <tjm1100@gmail.com>
git-committer:
wgw <tjm1100@gmail.com> 1202425904 -0600
git-parent:

[ace2e2c108fb3528f3c1b4ab5b81cd01b7324535], [d66ab95ed7b0ed44eb94f30e0ae9945acc2b4d9a]

git-author:
wgw <tjm1100@gmail.com> 1202425904 -0600
Message:

Merge branch 'master' into subfolders-8.3

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • config.py

    rf0426e7 ra1e71c3  
    213213        return int(int(strtod(config.get('Server', 'max_audio_br'))/1000)/64)*64 
    214214    except NoOptionError:  
    215         if isHDtivo(tsn): 
    216             return int(448) #default to 448, max supported by HD TiVo's 
    217         else: 
    218             return int(384) #default to 384, max supported by mp2 audio (S2 TiVo) 
     215        return int(448) #default to 448 
    219216 
    220217# Parse a bitrate using the SI/IEEE suffix values as if by ffmpeg