[xiph-commits] r14948 - trunk/ffmpeg2theora

[j at svn.xiph.org]

Author: j
Date: 2008-05-23 10:55:38 -0700 (Fri, 23 May 2008)
New Revision: 14948

Modified:
   trunk/ffmpeg2theora/
   trunk/ffmpeg2theora/subtitles.c
   trunk/ffmpeg2theora/subtitles.h
Log:
make make work again with kate available


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

   + timestamp: 2008-05-23 18:30:06.611999989 +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

   + 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


Modified: trunk/ffmpeg2theora/subtitles.c
===================================================================
--- trunk/ffmpeg2theora/subtitles.c	2008-05-23 14:35:13 UTC (rev 14947)
+++ trunk/ffmpeg2theora/subtitles.c	2008-05-23 17:55:38 UTC (rev 14948)
@@ -56,7 +56,7 @@
 /*
  * sets the filename of the next subtitles file
  */
-static void set_subtitles_file(ff2theora this,const char *filename){
+void set_subtitles_file(ff2theora this,const char *filename){
   size_t n;
   for (n=0; n<this->n_kate_streams;++n) {
     if (!this->kate_streams[n].filename) break;
@@ -68,7 +68,7 @@
 /*
  * sets the language of the next subtitles file
  */
-static void set_subtitles_language(ff2theora this,const char *language){
+void set_subtitles_language(ff2theora this,const char *language){
   size_t n;
   for (n=0; n<this->n_kate_streams;++n) {
     if (!this->kate_streams[n].subtitles_language[0]) break;
@@ -81,7 +81,7 @@
 /*
  * sets the category of the next subtitles file
  */
-static void set_subtitles_category(ff2theora this,const char *category){
+void set_subtitles_category(ff2theora this,const char *category){
   size_t n;
   for (n=0; n<this->n_kate_streams;++n) {
     if (!this->kate_streams[n].subtitles_category[0]) break;
@@ -94,7 +94,7 @@
 /**
   * sets the encoding of the next subtitles file
   */
-static void set_subtitles_encoding(ff2theora this,F2T_ENCODING encoding){
+void set_subtitles_encoding(ff2theora this,F2T_ENCODING encoding){
   size_t n;
   for (n=0; n<this->n_kate_streams;++n) {
     if (this->kate_streams[n].subtitles_encoding==ENC_UNSET) break;
@@ -104,7 +104,7 @@
 }
 
 
-static void report_unknown_subtitle_encoding(const char *name)
+void report_unknown_subtitle_encoding(const char *name)
 {
   fprintf(stderr, "Unknown character encoding: %s\n",name);
   fprintf(stderr, "Valid character encodings are:\n");

Modified: trunk/ffmpeg2theora/subtitles.h
===================================================================
--- trunk/ffmpeg2theora/subtitles.h	2008-05-23 14:35:13 UTC (rev 14947)
+++ trunk/ffmpeg2theora/subtitles.h	2008-05-23 17:55:38 UTC (rev 14948)
@@ -16,12 +16,15 @@
 #define SUPPORTED_ENCODINGS "utf-8, utf8, iso-8859-1, latin1"
 
 static void add_kate_stream(ff2theora this);
-static void set_subtitles_file(ff2theora this,const char *filename);
-static void set_subtitles_language(ff2theora this,const char *language);
-
 extern int load_subtitles(ff2theora_kate_stream *this);
 extern void free_subtitles(ff2theora this);
-static void report_unknown_subtitle_encoding(const char *name);
+
+extern void set_subtitles_file(ff2theora this,const char *filename);
+extern void set_subtitles_language(ff2theora this,const char *language);
+extern void set_subtitles_category(ff2theora this,const char *category);
+extern void set_subtitles_encoding(ff2theora this,F2T_ENCODING encoding);
+extern void report_unknown_subtitle_encoding(const char *name);
+
 static char *fgets2(char *s,size_t sz,FILE *f);
 static double hmsms2s(int h,int m,int s,int ms);
 static void convert_subtitle_to_utf8(F2T_ENCODING encoding,unsigned char *text);