theora version is now 1.1.0, quality and bitrate can be defined

SConstruct

@@ -112,7 +112,7 @@ if not conf.CheckPKGConfig(pkgconfig_version):
    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

src/ffmpeg2theora.c

@@ -2490,8 +2490,6 @@ int main(int argc, char **argv) {
         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
     }