# HG changeset patch
# User nenolod
# Date 1144260832 25200
# Node ID 822114b4b8a842d32720dbbd9b1e25d297622259
# Parent  4be0046a09e4bf5114d25cba46335c05ae7c0779
[svn] - more progress

diff -r 4be0046a09e4 -r 822114b4b8a8 Plugins/Input/shorten/avformat.h
--- a/Plugins/Input/shorten/avformat.h	Wed Apr 05 11:07:10 2006 -0700
+++ b/Plugins/Input/shorten/avformat.h	Wed Apr 05 11:13:52 2006 -0700
@@ -432,7 +432,7 @@
 /* raw.c */
 int pcm_read_seek(AVFormatContext *s, 
                   int stream_index, int64_t timestamp);
-int raw_init(void);
+int _raw_init(void);
 
 /* mp3.c */
 int mp3_init(void);
@@ -504,7 +504,7 @@
 void av_hex_dump(FILE *f, uint8_t *buf, int size);
 void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload);
 
-void av_register_all(void);
+void _av_register_all(void);
 
 typedef struct FifoBuffer {
     uint8_t *buffer;
diff -r 4be0046a09e4 -r 822114b4b8a8 Plugins/Input/shorten/init.c
--- a/Plugins/Input/shorten/init.c	Wed Apr 05 11:07:10 2006 -0700
+++ b/Plugins/Input/shorten/init.c	Wed Apr 05 11:13:52 2006 -0700
@@ -25,7 +25,7 @@
 #include "avcodec.h"
 #include "avformat.h"
 
-void avcodec_register_all(void)
+void _avcodec_register_all(void)
 {
 	static int inited = 0;
     
@@ -36,11 +36,14 @@
 	register_avcodec(&shorten_decoder);
 }
 
-void av_register_all(void)
+void _av_register_all(void)
 {
+        puts("calling avcodec_init()\n");
 	avcodec_init();
-	avcodec_register_all();
-	raw_init();
+        puts("calling avcodec_register_all()\n");
+	_avcodec_register_all();
+        puts("calling raw_init()\n");
+	_raw_init();
 
 	/* file protocols */
 	register_protocol(&file_protocol);
diff -r 4be0046a09e4 -r 822114b4b8a8 Plugins/Input/shorten/shorten_container.c
--- a/Plugins/Input/shorten/shorten_container.c	Wed Apr 05 11:07:10 2006 -0700
+++ b/Plugins/Input/shorten/shorten_container.c	Wed Apr 05 11:13:52 2006 -0700
@@ -76,8 +76,9 @@
     .extensions = "shn",
 };
 
-int raw_init(void)
+int _raw_init(void)
 {
+    puts("initialized shorten container code");
     av_register_input_format(&shorten_iformat);
     return 0;
 }
diff -r 4be0046a09e4 -r 822114b4b8a8 Plugins/Input/shorten/shorten_plugin.c
--- a/Plugins/Input/shorten/shorten_plugin.c	Wed Apr 05 11:07:10 2006 -0700
+++ b/Plugins/Input/shorten/shorten_plugin.c	Wed Apr 05 11:13:52 2006 -0700
@@ -136,9 +136,12 @@
 
 static void shn_init(void)
 {
+    puts("init called\n");
+#if 0
     avcodec_init();
     avcodec_register_all();
-    av_register_all();
+#endif
+    _av_register_all();
 }
 
 static int shn_is_our_file(char *filename)