Mercurial > audlegacy
changeset 917:822114b4b8a8 trunk
[svn] - more progress
| author | nenolod |
|---|---|
| date | Wed, 05 Apr 2006 11:13:52 -0700 |
| parents | 4be0046a09e4 |
| children | b59d9a02b160 |
| files | Plugins/Input/shorten/avformat.h Plugins/Input/shorten/init.c Plugins/Input/shorten/shorten_container.c Plugins/Input/shorten/shorten_plugin.c |
| diffstat | 4 files changed, 15 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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);
--- 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; }
--- 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)