diff options
| author | Karl Vollmer <vollmer@ampache.org> | 2010-12-09 22:37:41 -0400 |
|---|---|---|
| committer | Karl Vollmer <vollmer@ampache.org> | 2010-12-09 22:37:41 -0400 |
| commit | 636ac7b33b0e08b394b665b7c52e551f5ef4efa7 (patch) | |
| tree | 30bb04a716ef4fd6de0fe1de9b1887e7ada5b824 /play/index.php | |
| parent | 5cd7146c4d3c011e40b42d0b4c6fcf8c90eeb09d (diff) | |
| download | ampache-636ac7b33b0e08b394b665b7c52e551f5ef4efa7.tar.gz ampache-636ac7b33b0e08b394b665b7c52e551f5ef4efa7.tar.bz2 ampache-636ac7b33b0e08b394b665b7c52e551f5ef4efa7.zip | |
Fix #67 - Don't transcode video files using audio rules even if transcoding is set to always
Diffstat (limited to 'play/index.php')
| -rw-r--r-- | play/index.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/play/index.php b/play/index.php index 0639bc79..430230d5 100644 --- a/play/index.php +++ b/play/index.php @@ -302,7 +302,7 @@ if (Config::get('downsample_remote')) { } // if downsample remote is enabled // If they are downsampling, or if the song is not a native stream or it's non-local -if ((Config::get('transcode') == 'always' || !$media->native_stream() || +if (((Config::get('transcode') == 'always' AND !$video) || !$media->native_stream() || isset($not_local)) && Config::get('transcode') != 'never') { debug_event('Downsample','Starting Downsample {Transcode:' . Config::get('transcode') . '} {Native Stream:' . $media->native_stream() .'} {Not Local:' . $not_local . '}','5'); $fp = Stream::start_downsample($media,$lastid,$media_name,$start); |