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

[oggk at svn.xiph.org]

Author: oggk
Date: 2009-05-30 10:51:49 -0700 (Sat, 30 May 2009)
New Revision: 16060

Modified:
   trunk/ffmpeg2theora/src/ffmpeg2theora.c
   trunk/ffmpeg2theora/src/theorautils.c
Log:
disable more code when HAVE_KATE is not defined - this avoids using some
 data which wasn't initialized when the init code was compiled out.



Modified: trunk/ffmpeg2theora/src/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/src/ffmpeg2theora.c	2009-05-30 09:53:17 UTC (rev 16059)
+++ trunk/ffmpeg2theora/src/ffmpeg2theora.c	2009-05-30 17:51:49 UTC (rev 16060)
@@ -783,6 +783,7 @@
     for (i = 0; i < this->context->nb_streams; i++) {
       subtitles_enabled[i] = 0;
       subtitles_opened[i] = 0;
+#ifdef HAVE_KATE
       if (!this->disable_subtitles) {
         AVStream *stream = this->context->streams[i];
         AVCodecContext *enc = stream->codec;
@@ -800,8 +801,10 @@
           }
         }
       }
+#endif
     }
 
+#ifdef HAVE_KATE
     for (i=0; i<this->n_kate_streams; ++i) {
         ff2theora_kate_stream *ks=this->kate_streams+i;
         if (ks->stream_index >= 0) {
@@ -829,6 +832,7 @@
           }
         }
     }
+#endif
 
     oggmux_setup_kate_streams(&info, this->n_kate_streams);
 

Modified: trunk/ffmpeg2theora/src/theorautils.c
===================================================================
--- trunk/ffmpeg2theora/src/theorautils.c	2009-05-30 09:53:17 UTC (rev 16059)
+++ trunk/ffmpeg2theora/src/theorautils.c	2009-05-30 17:51:49 UTC (rev 16060)
@@ -452,6 +452,7 @@
         fwrite (og.header, 1, og.header_len,info->outfile);
         fwrite (og.body, 1, og.body_len, info->outfile);
     }
+#ifdef HAVE_KATE
     if (info->with_kate) {
         int n;
         for (n=0; n<info->n_kate_streams; ++n) {
@@ -470,6 +471,7 @@
             }
         }
     }
+#endif
 
     if (info->with_skeleton) {
         int result;