[xiph-commits] r17641 - trunk/ffmpeg2theora/src

[j at svn.xiph.org]

Author: j
Date: 2010-11-23 13:19:11 -0800 (Tue, 23 Nov 2010)
New Revision: 17641

Modified:
   trunk/ffmpeg2theora/src/ffmpeg2theora.c
Log:
use frame aspect for padma-stream preset

Modified: trunk/ffmpeg2theora/src/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/src/ffmpeg2theora.c	2010-11-23 13:52:53 UTC (rev 17640)
+++ trunk/ffmpeg2theora/src/ffmpeg2theora.c	2010-11-23 21:19:11 UTC (rev 17641)
@@ -701,14 +701,10 @@
                 this->frame_aspect.num = width;
                 this->frame_aspect.den = height;
             }
-            if (av_q2d(this->frame_aspect) <= 1.5) {
-                this->picture_width=128;
-                this->picture_height=96;
-            }
-            else {
-                this->picture_width=128;
-                this->picture_height=72;
-            }
+
+            this->picture_width=128;
+            this->picture_height=128/av_q2d(this->frame_aspect);
+
             this->frame_aspect.num = this->picture_width;
             this->frame_aspect.den = this->picture_height;
         }