Permalink
Browse files

Backport [27173] from trunk

Fix the case where the detected resolution is all over the place.  Make the FLV
player scale based on only the initial resolution at frame 0.

Fixes #9036.



git-svn-id: http://svn.mythtv.org/svn/branches/release-0-24-fixes@27174 7dbf422c-18fa-0310-86e9-fd20926502f2
  • Loading branch information...
1 parent d701037 commit 52cb8fb98f1aa209cfd2befa92a9cdd0b7841070 @Beirdo Beirdo committed Nov 11, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 modules/stream/stream_flv.pl
@@ -55,7 +55,7 @@
my ($abitrate) = $sh->fetchrow_array;
$sh->finish();
# auto-detect height based on aspect ratio
- $sh = $dbh->prepare('SELECT data FROM recordedmarkup WHERE chanid=? AND starttime=FROM_UNIXTIME(?) AND (type=30 OR type=31) AND data IS NOT NULL ORDER BY type');
+ $sh = $dbh->prepare('SELECT data FROM recordedmarkup WHERE chanid=? AND starttime=FROM_UNIXTIME(?) AND (type=30 OR type=31) AND mark=0 AND data IS NOT NULL ORDER BY type');
$sh->execute($chanid,$starttime);
$x = $sh->fetchrow_array; # type = 30
$y = $sh->fetchrow_array if ($x); # type = 31

0 comments on commit 52cb8fb

Please sign in to comment.