Mercurial > audlegacy-plugins
changeset 824:420eb823b2d4 trunk
[svn] - url_fsize support.
- directly link libavutil to our module
| author | nenolod |
|---|---|
| date | Mon, 12 Mar 2007 14:19:59 -0700 |
| parents | a195f1259a6b |
| children | 3cbdc6e19d7c |
| files | ChangeLog src/ffmpeg/Makefile src/ffmpeg/libavformat/aviobuf.c src/ffmpeg/libavutil/Makefile |
| diffstat | 4 files changed, 37 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Mar 12 14:12:00 2007 -0700 +++ b/ChangeLog Mon Mar 12 14:19:59 2007 -0700 @@ -1,3 +1,14 @@ +2007-03-12 21:12:00 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [1746] + - merge VFS support from wma plugin. + + trunk/src/ffmpeg/libavformat/avformat.h | 7 + trunk/src/ffmpeg/libavformat/avio.c | 107 ++---- + trunk/src/ffmpeg/libavformat/avio.h | 52 --- + trunk/src/ffmpeg/libavformat/aviobuf.c | 553 ++++---------------------------- + 4 files changed, 150 insertions(+), 569 deletions(-) + + 2007-03-12 21:04:53 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [1744] - i don't want to hear about deprecation, thanks.
--- a/src/ffmpeg/Makefile Mon Mar 12 14:12:00 2007 -0700 +++ b/src/ffmpeg/Makefile Mon Mar 12 14:19:59 2007 -0700 @@ -7,7 +7,7 @@ LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) -LIBADD = ./libavutil/libavutil.a ./libavformat/libavformat.a $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) +LIBADD = ./libavformat/libavformat.a $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) SOURCES = ffmpeg.c \ libavcodec/aasc.c \ @@ -66,7 +66,20 @@ libavcodec/wavpack.c \ libavcodec/wmadec.c \ libavcodec/wnv1.c \ - libavcodec/ws-snd1.c + libavcodec/ws-snd1.c \ + libavutil/adler32.c \ + libavutil/crc.c \ + libavutil/fifo.c \ + libavutil/integer.c \ + libavutil/intfloat_readwrite.c \ + libavutil/lls.c \ + libavutil/log.c \ + libavutil/mathematics.c \ + libavutil/md5.c \ + libavutil/mem.c \ + libavutil/rational.c \ + libavutil/softfloat.c \ + OBJECTS = ${SOURCES:.c=.o}
--- a/src/ffmpeg/libavformat/aviobuf.c Mon Mar 12 14:12:00 2007 -0700 +++ b/src/ffmpeg/libavformat/aviobuf.c Mon Mar 12 14:19:59 2007 -0700 @@ -395,3 +395,14 @@ return s->max_packet_size; } +offset_t url_fsize(ByteIOContext *s) +{ + offset_t size; + + if (!s->seek) + return -EPIPE; + size = s->seek(s->opaque, -1, SEEK_END) + 1; + s->seek(s->opaque, s->pos, SEEK_SET); + return size; +} +
--- a/src/ffmpeg/libavutil/Makefile Mon Mar 12 14:12:00 2007 -0700 +++ b/src/ffmpeg/libavutil/Makefile Mon Mar 12 14:19:59 2007 -0700 @@ -1,18 +1,3 @@ include ../../../mk/rules.mk include ../../../mk/init.mk - -OBJECTIVE_LIBS_NOINST= libavutil.a - -SOURCES = \ -adler32.c integer.c log.c mem.c \ -crc.c intfloat_readwrite.c mathematics.c rational.c \ -fifo.c lls.c md5.c softfloat.c - -CFLAGS+= $(PICFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -c -I../../.. -I../libavformat -I../libavutil -I.. -DHAVE_AV_CONFIG_H - -OBJECTS=${SOURCES:.c=.o} - include ../../../mk/objective.mk - -libavutil.a: $(OBJECTS) - $(AR) cq $@ $(OBJECTS)