Commit Graph

6449 Commits (ef644ca8a973865e29322ce5451d7688f1de0adb)
 

Author SHA1 Message Date
Luke 887c09e737 Merge pull request #1346 from MediaBrowser/master
9 years ago
Luke Pulverenti 7dffc197da fix merge conflict
9 years ago
Luke Pulverenti 83a2823c17 3.0.5781.9
9 years ago
Luke Pulverenti 6b05f526a0 fix require path
9 years ago
Luke Pulverenti 31565d2c77 adjust ffmpeg validator
9 years ago
Luke Pulverenti 99d7932237 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
9 years ago
Luke Pulverenti c6a01e0370 allow separate customization of ffmpeg/ffprobe paths
9 years ago
Luke Pulverenti e290f24718 fix 64-bit windows build
9 years ago
Luke 0c203edf7b update components
9 years ago
Luke Pulverenti 3061e6c876 3.0.5781.8
9 years ago
Luke b14ca8863f Merge pull request #1345 from MediaBrowser/master
9 years ago
Luke a3f331c9a6 Merge pull request #1344 from MediaBrowser/master
9 years ago
Luke 70e8cca670 Merge pull request #1343 from MediaBrowser/master
9 years ago
Luke Pulverenti 0eaeaa45be Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
9 years ago
Luke 616f1b10cc Merge pull request #1342 from MediaBrowser/master
9 years ago
Luke Pulverenti fae4079a69 restore changes
9 years ago
Luke 52f4962ca7 Merge pull request #1341 from MediaBrowser/master
9 years ago
Luke Pulverenti 0948e8e1c5 fix merge conflict
9 years ago
Luke Pulverenti aced2dd6fe update theme
9 years ago
Luke 022f380c5a Merge pull request #1340 from MediaBrowser/master
9 years ago
Luke 5065acc821 Merge pull request #1339 from MediaBrowser/master
9 years ago
Luke Pulverenti 1c28345a19 fix file deletion
9 years ago
Luke Pulverenti 59277211c7 update interlaced detection
9 years ago
Luke Pulverenti 3c433e95b9 update interlaced detection
9 years ago
Luke 1f62c42547 Merge pull request #1338 from MediaBrowser/master
9 years ago
Luke Pulverenti 255747337a fix merge conflict
9 years ago
Luke Pulverenti bd201f5120 sync media encoder
9 years ago
Luke 32dfef320e Merge pull request #1337 from MediaBrowser/mediainfo
9 years ago
Luke Pulverenti 4595c3854c update interlaced detection formats
9 years ago
Luke Pulverenti 8d6acbbc68 adjust logging
9 years ago
Luke Pulverenti 6ea8ef9107 restore changes
9 years ago
Luke acd8b0d7a8 Merge pull request #1336 from MediaBrowser/mediainfo
9 years ago
Luke Pulverenti 949d23f06a fix merge conflict
9 years ago
Luke Pulverenti 5fffd38963 detect interlaced
9 years ago
Luke Pulverenti 5c610d71f6 remove call from probe result normalizer
9 years ago
Luke 8211e3daeb Merge pull request #1335 from MediaBrowser/mediainfo
9 years ago
Luke Pulverenti 940702aa0b update solution files
9 years ago
Luke 0a3b8d9522 Merge pull request #1334 from MediaBrowser/mediainfo
9 years ago
Luke Pulverenti bf983f76db fix merge conflict
9 years ago
Luke Pulverenti b51ea9e4fa fix merge conflict
9 years ago
Luke Pulverenti 5963affec5 fix merge conflict
9 years ago
Luke Pulverenti ca52e8c23b fix merge conflict
9 years ago
Luke Pulverenti 6414fc9486 remove MediaInfo
9 years ago
Luke 6949e502dd Merge pull request #1333 from MediaBrowser/master
9 years ago
Luke Pulverenti be664f93c6 update translations
9 years ago
Luke 90d5604392 Merge pull request #1332 from MediaBrowser/master
9 years ago
Luke 7906adc379 Merge pull request #1331 from MediaBrowser/master
9 years ago
Luke be5f2e5950 Merge pull request #1330 from MediaBrowser/master
9 years ago
Luke Pulverenti 62e32a6ed9 update components
9 years ago
Luke 22523484e4 Merge pull request #1329 from MediaBrowser/master
9 years ago