[FFmpeg-cvslog] r17876 - in trunk/libavutil: fifo.c fifo.h lzo.c rc4.c

[reimar]

Author: reimar
Date: Sun Mar  8 16:02:12 2009
New Revision: 17876

Log:
Remove more functions disabled by major version bump.

Modified:
   trunk/libavutil/fifo.c
   trunk/libavutil/fifo.h
   trunk/libavutil/lzo.c
   trunk/libavutil/rc4.c

Modified: trunk/libavutil/fifo.c
==============================================================================
--- trunk/libavutil/fifo.c	Sun Mar  8 15:51:25 2009	(r17875)
+++ trunk/libavutil/fifo.c	Sun Mar  8 16:02:12 2009	(r17876)
@@ -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, un
     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;

Modified: trunk/libavutil/fifo.h
==============================================================================
--- trunk/libavutil/fifo.h	Sun Mar  8 15:51:25 2009	(r17875)
+++ trunk/libavutil/fifo.h	Sun Mar  8 16:02:12 2009	(r17876)
@@ -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(
  */
 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

Modified: trunk/libavutil/lzo.c
==============================================================================
--- trunk/libavutil/lzo.c	Sun Mar  8 15:51:25 2009	(r17875)
+++ trunk/libavutil/lzo.c	Sun Mar  8 16:02:12 2009	(r17876)
@@ -234,12 +234,6 @@ int av_lzo1x_decode(void *out, int *outl
     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>

Modified: trunk/libavutil/rc4.c
==============================================================================
--- trunk/libavutil/rc4.c	Sun Mar  8 15:51:25 2009	(r17875)
+++ trunk/libavutil/rc4.c	Sun Mar  8 16:02:12 2009	(r17876)
@@ -59,11 +59,3 @@ void av_rc4_crypt(AVRC4 *r, uint8_t *dst
     }
     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