[xiph-commits] r16567 - in trunk/ffmpeg2theora: . src

[j at svn.xiph.org]

Author: j
Date: 2009-09-24 14:08:04 -0700 (Thu, 24 Sep 2009)
New Revision: 16567

Modified:
   trunk/ffmpeg2theora/SConstruct
   trunk/ffmpeg2theora/src/ffmpeg2theora.c
Log:
theora version is now 1.1.0, quality and bitrate can be defined

Modified: trunk/ffmpeg2theora/SConstruct
===================================================================
--- trunk/ffmpeg2theora/SConstruct	2009-09-24 20:28:13 UTC (rev 16566)
+++ trunk/ffmpeg2theora/SConstruct	2009-09-24 21:08:04 UTC (rev 16567)
@@ -112,7 +112,7 @@
    print 'pkg-config >= %s not found.' % pkgconfig_version 
    Exit(1)
 
-XIPH_LIBS="ogg >= 1.1 vorbis vorbisenc theoraenc >= 1.1beta3"
+XIPH_LIBS="ogg >= 1.1 vorbis vorbisenc theoraenc >= 1.1.0"
 
 if not conf.CheckPKG(XIPH_LIBS): 
   print 'some xiph libs are missing, ffmpeg2theora depends on %s' % XIPH_LIBS

Modified: trunk/ffmpeg2theora/src/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/src/ffmpeg2theora.c	2009-09-24 20:28:13 UTC (rev 16566)
+++ trunk/ffmpeg2theora/src/ffmpeg2theora.c	2009-09-24 21:08:04 UTC (rev 16567)
@@ -2490,8 +2490,6 @@
         if (convert->video_quality == -1)
             convert->video_quality = 0;
     } else {
-        if (convert->video_bitrate > 0)
-            convert->video_quality = 0;
         if (convert->video_quality == -1)
             convert->video_quality = rint(5*6.3); // default quality 5
     }