aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-12-19 02:33:47 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-12-19 02:33:47 +0000
commit004050eed7d7e66d753c3de14cbf0c3f7a414732 (patch)
tree241bd4096778d64c3d04a81e73fdc9dc0bb7e7a2
parent0cd60abf7b88013c3d791a239f466d87e3fc8bea (diff)
downloadffmpeg-004050eed7d7e66d753c3de14cbf0c3f7a414732.tar.gz
Remove unneeded avio wrapper functions.
Originally committed as revision 11264 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/aviobuf.c27
1 files changed, 1 insertions, 26 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 88397778ba..d3777d15c0 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -500,31 +500,6 @@ uint64_t ff_get_v(ByteIOContext *bc){
return val;
}
-/* link with avio functions */
-
-#ifdef CONFIG_MUXERS
-static int url_write_packet(void *opaque, uint8_t *buf, int buf_size)
-{
- URLContext *h = opaque;
- return url_write(h, buf, buf_size);
-}
-#else
-#define url_write_packet NULL
-#endif //CONFIG_MUXERS
-
-static int url_read_packet(void *opaque, uint8_t *buf, int buf_size)
-{
- URLContext *h = opaque;
- return url_read(h, buf, buf_size);
-}
-
-static offset_t url_seek_packet(void *opaque, offset_t offset, int whence)
-{
- URLContext *h = opaque;
- return url_seek(h, offset, whence);
- //return 0;
-}
-
int url_fdopen(ByteIOContext **s, URLContext *h)
{
uint8_t *buffer;
@@ -549,7 +524,7 @@ int url_fdopen(ByteIOContext **s, URLContext *h)
if (init_put_byte(*s, buffer, buffer_size,
(h->flags & URL_WRONLY || h->flags & URL_RDWR), h,
- url_read_packet, url_write_packet, url_seek_packet) < 0) {
+ url_read, url_write, url_seek) < 0) {
av_free(buffer);
av_freep(s);
return AVERROR(EIO);