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

[j at svn.xiph.org]

Author: j
Date: 2008-05-29 03:31:14 -0700 (Thu, 29 May 2008)
New Revision: 14979

Modified:
   trunk/ffmpeg2theora/
   trunk/ffmpeg2theora/SConstruct
   trunk/ffmpeg2theora/src/ffmpeg2theora.c
Log:
 * init framerate
 * remove avpicture_free that causes segfaults
 * add debug option to SConstruct



Property changes on: trunk/ffmpeg2theora
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2008-05-28 13:13:29.579999924 +0200
committer: j
properties: 
	branch-nick: ffmpeg2theora

   + timestamp: 2008-05-29 12:29:40.973000050 +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
210 j-20080528102006-aeippim0tn70mz3f
211 j-20080528104907-40kiidjojvta8j61
212 j-20080528111329-vkqbt7xkat2o9h4z

   + 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
211 j-20080528104907-40kiidjojvta8j61
212 j-20080528111329-vkqbt7xkat2o9h4z
213 j-20080529102940-q9xdwm5v9espzomv


Modified: trunk/ffmpeg2theora/SConstruct
===================================================================
--- trunk/ffmpeg2theora/SConstruct	2008-05-28 14:32:10 UTC (rev 14978)
+++ trunk/ffmpeg2theora/SConstruct	2008-05-29 10:31:14 UTC (rev 14979)
@@ -11,6 +11,7 @@
 opts = Options()
 opts.AddOptions(
   BoolOption('static', 'Set to 1 for static linking', 0),
+  BoolOption('debug', 'Set to 1 to enable debugging', 0),
   ('prefix', 'install architecture-independent files in', '/usr/local'),
   ('bindir', 'user executables', 'PREFIX/bin'),
   ('mandir', 'man documentation', 'PREFIX/man'),
@@ -42,8 +43,8 @@
 env.Append(CCFLAGS = Split('$APPEND_CCFLAGS'))
 env.Append(LINKFLAGS = Split('$APPEND_LINKFLAGS'))
 
-#if env['CC'] == 'gcc':
-#  env.Append(CCFLAGS=["-g", "-O2", "-Wall"])
+if env['debug'] and env['CC'] == 'gcc':
+  env.Append(CCFLAGS=["-g", "-O2", "-Wall"])
 
 def CheckPKGConfig(context, version): 
   context.Message( 'Checking for pkg-config... ' ) 

Modified: trunk/ffmpeg2theora/src/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/src/ffmpeg2theora.c	2008-05-28 14:32:10 UTC (rev 14978)
+++ trunk/ffmpeg2theora/src/ffmpeg2theora.c	2008-05-29 10:31:14 UTC (rev 14979)
@@ -123,7 +123,6 @@
  */
 static void frame_dealloc (AVFrame *frame) {
     if (frame) {
-        avpicture_free((AVPicture*)frame);
         av_free(frame);
     }
 }
@@ -1041,6 +1040,9 @@
     const char *p;
     AVRational framerate;
 
+    framerate.num = -1;
+    framerate.den = 1;
+
     p = strchr(arg, ':');
     if (!p) {
       p = strchr(arg, '/');