diff options
author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-03-08 18:02:12 +0300 |
---|---|---|
committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-03-08 18:02:12 +0300 |
commit | fe4032b66a20fea40f9d1cc147c07dc45b5ecadc (patch) | |
tree | e491ca244bf745526ab04949f8480f7bb514bf62 | |
parent | 3fb108430645c15beb3c1f1c84fdfcd92de3bdb8 (diff) |
Remove more functions disabled by major version bump.
Originally committed as revision 17876 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavutil/fifo.c | 13 | ||||
-rw-r--r-- | libavutil/fifo.h | 20 | ||||
-rw-r--r-- | libavutil/lzo.c | 6 | ||||
-rw-r--r-- | libavutil/rc4.c | 8 |
4 files changed, 0 insertions, 47 deletions
diff --git a/libavutil/fifo.c b/libavutil/fifo.c index 26a81657d9..57b229a4c4 100644 --- a/libavutil/fifo.c +++ b/libavutil/fifo.c @@ -48,12 +48,6 @@ int av_fifo_size(AVFifoBuffer *f) return (uint32_t)(f->wndx - f->rndx); } -#if LIBAVUTIL_VERSION_MAJOR < 50 -void av_fifo_realloc(AVFifoBuffer *f, unsigned int new_size) { - av_fifo_realloc2(f, new_size); -} -#endif - int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) { unsigned int old_size= f->end - f->buffer; @@ -73,13 +67,6 @@ int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) { return 0; } -#if LIBAVUTIL_VERSION_MAJOR < 50 -void av_fifo_write(AVFifoBuffer *f, const uint8_t *buf, int size) -{ - av_fifo_generic_write(f, (void *)buf, size, NULL); -} -#endif - int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int)) { int total = size; diff --git a/libavutil/fifo.h b/libavutil/fifo.h index d1949044ff..9ba7e700fc 100644 --- a/libavutil/fifo.h +++ b/libavutil/fifo.h @@ -64,16 +64,6 @@ int av_fifo_size(AVFifoBuffer *f); */ int av_fifo_generic_read(AVFifoBuffer *f, int buf_size, void (*func)(void*, void*, int), void* dest); -#if LIBAVUTIL_VERSION_MAJOR < 50 -/** - * Writes data into an AVFifoBuffer. - * @param *f AVFifoBuffer to write to - * @param *buf data source - * @param size data size - */ -attribute_deprecated void av_fifo_write(AVFifoBuffer *f, const uint8_t *buf, int size); -#endif - /** * Feeds data from a user-supplied callback to an AVFifoBuffer. * @param *f AVFifoBuffer to write to @@ -88,16 +78,6 @@ attribute_deprecated void av_fifo_write(AVFifoBuffer *f, const uint8_t *buf, int */ int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int)); -#if LIBAVUTIL_VERSION_MAJOR < 50 -/** - * Resizes an AVFifoBuffer. - * @param *f AVFifoBuffer to resize - * @param size new AVFifoBuffer size in bytes - * @see av_fifo_realloc2() - */ -attribute_deprecated void av_fifo_realloc(AVFifoBuffer *f, unsigned int size); -#endif - /** * Resizes an AVFifoBuffer. * @param *f AVFifoBuffer to resize diff --git a/libavutil/lzo.c b/libavutil/lzo.c index 83fa9bfbaf..686983a506 100644 --- a/libavutil/lzo.c +++ b/libavutil/lzo.c @@ -234,12 +234,6 @@ int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen) { return c.error; } -#if LIBAVUTIL_VERSION_MAJOR < 50 -int lzo1x_decode(void *out, int *outlen, const void *in, int *inlen) { - return av_lzo1x_decode(out, outlen, in, inlen); -} -#endif - #ifdef TEST #include <stdio.h> #include <lzo/lzo1x.h> diff --git a/libavutil/rc4.c b/libavutil/rc4.c index e6e7dc9e1a..4e52ba5ac1 100644 --- a/libavutil/rc4.c +++ b/libavutil/rc4.c @@ -59,11 +59,3 @@ void av_rc4_crypt(AVRC4 *r, uint8_t *dst, const uint8_t *src, int count, uint8_t } r->x = x; r->y = y; } - -#if LIBAVUTIL_VERSION_MAJOR < 50 -void ff_rc4_enc(const uint8_t *key, int keylen, uint8_t *data, int datalen) { - AVRC4 r; - av_rc4_init(&r, key, keylen * 8, 0); - av_rc4_crypt(&r, data, data, datalen, NULL, 0); -} -#endif |