[xiph-commits] r14676 - trunk/ffmpeg2theora

[j at svn.xiph.org]

Author: j
Date: 2008-04-08 08:39:55 -0700 (Tue, 08 Apr 2008)
New Revision: 14676

Modified:
   trunk/ffmpeg2theora/ffmpeg2theora.c
Log:
only show subtitle options if kate is enabled, use newer av register calls

Modified: trunk/ffmpeg2theora/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/ffmpeg2theora.c	2008-04-08 09:44:32 UTC (rev 14675)
+++ trunk/ffmpeg2theora/ffmpeg2theora.c	2008-04-08 15:39:55 UTC (rev 14676)
@@ -1488,6 +1488,7 @@
         "                          not work with all input format you have to manually\n"
         "                          enable it if you have issues with A/V sync\n"
         "\n"
+#ifdef HAVE_KATE
         "Subtitles options:\n"
         "      --subtitles file                 use subtitles from the given file (SubRip (.srt) format)\n"
         "      --subtitles-encoding encoding    set encoding of the subtitles file\n"
@@ -1495,6 +1496,7 @@
         "      --subtitles-language language    set subtitles language (de, en_GB, etc)\n"
         "      --subtitles-category category    set subtitles category (default \"subtitles\")\n"
         "\n"
+#endif
         "Metadata options:\n"
         "      --artist           Name of artist (director)\n"
         "      --title            Title\n"
@@ -1618,7 +1620,9 @@
     FILE *fpid = NULL;
 
     ff2theora convert = ff2theora_init ();
-    av_register_all ();
+    avcodec_register_all();
+    avdevice_register_all();
+    av_register_all();
 
     if (argc == 1){
         print_usage ();