Mercurial > libavutil.hg

changeset 686:b084f8cd043f libavutil

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove more functions disabled by major version bump.
author reimar
date Sun, 08 Mar 2009 15:02:12 +0000
parents 634bcf10f5df
children bc81990848aa
files fifo.c fifo.h lzo.c rc4.c
diffstat 4 files changed, 0 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/fifo.c	Sun Mar 08 14:51:25 2009 +0000
+++ b/fifo.c	Sun Mar 08 15:02:12 2009 +0000
@@ -48,12 +48,6 @@
     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 @@
     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;
--- a/fifo.h	Sun Mar 08 14:51:25 2009 +0000
+++ b/fifo.h	Sun Mar 08 15:02:12 2009 +0000
@@ -64,16 +64,6 @@
  */
 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 @@
  */
 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
--- a/lzo.c	Sun Mar 08 14:51:25 2009 +0000
+++ b/lzo.c	Sun Mar 08 15:02:12 2009 +0000
@@ -234,12 +234,6 @@
     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>
--- a/rc4.c	Sun Mar 08 14:51:25 2009 +0000
+++ b/rc4.c	Sun Mar 08 15:02:12 2009 +0000
@@ -59,11 +59,3 @@
     }
     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