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

[j at svn.xiph.org]

Author: j
Date: 2009-09-24 14:18:22 -0700 (Thu, 24 Sep 2009)
New Revision: 16568

Modified:
   trunk/ffmpeg2theora/src/ffmpeg2theora.c
Log:
only set default quality if no bitrate is set

Modified: trunk/ffmpeg2theora/src/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/src/ffmpeg2theora.c	2009-09-24 21:08:04 UTC (rev 16567)
+++ trunk/ffmpeg2theora/src/ffmpeg2theora.c	2009-09-24 21:18:22 UTC (rev 16568)
@@ -2491,7 +2491,10 @@
             convert->video_quality = 0;
     } else {
         if (convert->video_quality == -1)
-            convert->video_quality = rint(5*6.3); // default quality 5
+            if (convert->video_bitrate > 0)
+                convert->video_quality = 0;
+            else
+                convert->video_quality = rint(5*6.3); // default quality 5
     }
     if (convert->buf_delay>0 && convert->video_bitrate == 0) {
         fprintf(stderr, "Buffer delay can only be used with target bitrate (-V).\n");