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

[j at svn.xiph.org]

Author: j
Date: 2008-05-28 07:31:35 -0700 (Wed, 28 May 2008)
New Revision: 14976

Modified:
   trunk/ffmpeg2theora/
   trunk/ffmpeg2theora/SConstruct
   trunk/ffmpeg2theora/src/ffmpeg2theora.c
Log:
use output framerate if not input framerate is defined


Property changes on: trunk/ffmpeg2theora
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2008-05-27 23:18:13.651999950 +0200
committer: j
properties: 
	branch-nick: ffmpeg2theora

   + timestamp: 2008-05-28 12:20:06.673000097 +0200
committer: j
properties: 
	branch-nick: ffmpeg2theora

Name: bzr:revision-id:v3-single1-dHJ1bmsvZmZtcGVnMnRoZW9yYQ..
   - 191 j-20080517230830-he5x8v2m8yrfiw35
192 j-20080518224037-pkmoctzf4qce7tog
193 j-20080518224409-6hbfp3k2ssn6egqa
194 j-20080520111939-dhi52qwbqe7a47cu
195 j-20080523092252-gj9k9db0s67vl7dw
196 j-20080523092420-l0850yrq1qkgz9t0
197 j-20080523093057-l5g0ezzy5geu0pey
198 j-20080523094343-kcno1dm2e1lr38q4
199 j-20080523163006-kjl6ewea5sxawmq2
200 j-20080523165904-l2vm52qae0hlqkhp
201 j-20080523175432-2ed953iktnl8c7cr
202 j-20080525100939-7oja8pk08v9fquiw
203 j-20080526111321-nhzaqh6ivzn0vs7b
204 j-20080527100851-2v5eyxxrq1riqi50
205 j-20080527101341-9ynbgth2b15jw792
206 j-20080527205556-19tffvfrxgt3khld
207 j-20080527205840-zeestdde3v1zks9k
208 j-20080527210129-e73y56uwmzbcid00
209 j-20080527211813-5ll680ed1q4byp16

   + 191 j-20080517230830-he5x8v2m8yrfiw35
192 j-20080518224037-pkmoctzf4qce7tog
193 j-20080518224409-6hbfp3k2ssn6egqa
194 j-20080520111939-dhi52qwbqe7a47cu
195 j-20080523092252-gj9k9db0s67vl7dw
196 j-20080523092420-l0850yrq1qkgz9t0
197 j-20080523093057-l5g0ezzy5geu0pey
198 j-20080523094343-kcno1dm2e1lr38q4
199 j-20080523163006-kjl6ewea5sxawmq2
200 j-20080523165904-l2vm52qae0hlqkhp
201 j-20080523175432-2ed953iktnl8c7cr
202 j-20080525100939-7oja8pk08v9fquiw
203 j-20080526111321-nhzaqh6ivzn0vs7b
204 j-20080527100851-2v5eyxxrq1riqi50
205 j-20080527101341-9ynbgth2b15jw792
206 j-20080527205556-19tffvfrxgt3khld
207 j-20080527205840-zeestdde3v1zks9k
208 j-20080527210129-e73y56uwmzbcid00
209 j-20080527211813-5ll680ed1q4byp16
210 j-20080528102006-aeippim0tn70mz3f


Modified: trunk/ffmpeg2theora/SConstruct
===================================================================
--- trunk/ffmpeg2theora/SConstruct	2008-05-28 12:43:15 UTC (rev 14975)
+++ trunk/ffmpeg2theora/SConstruct	2008-05-28 14:31:35 UTC (rev 14976)
@@ -9,7 +9,7 @@
 pkg_name="ffmpeg2theora"
 
 #parse config variables
-static = True
+static = False
 
 env = Environment()
 pkg_flags="--cflags --libs"

Modified: trunk/ffmpeg2theora/src/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/src/ffmpeg2theora.c	2008-05-28 12:43:15 UTC (rev 14975)
+++ trunk/ffmpeg2theora/src/ffmpeg2theora.c	2008-05-28 14:31:35 UTC (rev 14976)
@@ -1696,10 +1696,6 @@
     if(av_guess_image2_codec(inputfile_name) != CODEC_ID_NONE || \
        (input_fmt != NULL && strcmp(input_fmt->name, "video4linux") >= 0)) {
         memset(formatParams, 0, sizeof(*formatParams));
-        if(convert->force_input_fps.num > 0) {
-            formatParams->time_base.den = convert->force_input_fps.num;
-            formatParams->time_base.num = convert->force_input_fps.den;
-        }
         if(input_fmt != NULL && strcmp(input_fmt->name, "video4linux") >= 0) {
             formatParams->channel = 0;
             formatParams->width = PAL_HALF_WIDTH;
@@ -1714,6 +1710,9 @@
         if(convert->force_input_fps.num > 0) {
             formatParams->time_base.den = convert->force_input_fps.num;
             formatParams->time_base.num = convert->force_input_fps.den;
+        } else if(convert->framerate_new.num > 0) {
+            formatParams->time_base.den = convert->framerate_new.num;
+            formatParams->time_base.num = convert->framerate_new.den;
         }
         formatParams->video_codec_id = av_guess_image2_codec(inputfile_name);
     }