diff options
author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-06-09 16:41:27 +0000 |
---|---|---|
committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-06-09 16:41:27 +0000 |
commit | 547494de2924c9709a03db6f0b596e9d5a6540eb (patch) | |
tree | 0fe26dc5fa2785dce23ad25c37c524124b89891a /modules/id3/getid3/module.audio-video.quicktime.php | |
parent | 7e5654af67f1f24211c9cde4136cd396a71903b7 (diff) | |
download | ampache-547494de2924c9709a03db6f0b596e9d5a6540eb.tar.gz ampache-547494de2924c9709a03db6f0b596e9d5a6540eb.tar.bz2 ampache-547494de2924c9709a03db6f0b596e9d5a6540eb.zip |
some logic fixes for auto-transcoding
Diffstat (limited to 'modules/id3/getid3/module.audio-video.quicktime.php')
-rw-r--r-- | modules/id3/getid3/module.audio-video.quicktime.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/id3/getid3/module.audio-video.quicktime.php b/modules/id3/getid3/module.audio-video.quicktime.php index 9be09011..c5d6e8d9 100644 --- a/modules/id3/getid3/module.audio-video.quicktime.php +++ b/modules/id3/getid3/module.audio-video.quicktime.php @@ -853,8 +853,10 @@ class getid3_quicktime $ThisFileInfo['video']['resolution_x'] = $atomstructure['width']; $ThisFileInfo['video']['resolution_y'] = $atomstructure['height']; } - $ThisFileInfo['video']['resolution_x'] = max($ThisFileInfo['video']['resolution_x'], $atomstructure['width']); - $ThisFileInfo['video']['resolution_y'] = max($ThisFileInfo['video']['resolution_y'], $atomstructure['height']); + if ($atomstructure['flags']['enabled'] == 1) { + $ThisFileInfo['video']['resolution_x'] = max($ThisFileInfo['video']['resolution_x'], $atomstructure['width']); + $ThisFileInfo['video']['resolution_y'] = max($ThisFileInfo['video']['resolution_y'], $atomstructure['height']); + } if (!empty($ThisFileInfo['video']['resolution_x']) && !empty($ThisFileInfo['video']['resolution_y'])) { $ThisFileInfo['quicktime']['video']['resolution_x'] = $ThisFileInfo['video']['resolution_x']; $ThisFileInfo['quicktime']['video']['resolution_y'] = $ThisFileInfo['video']['resolution_y']; |