Originally committed as revision 17876 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.6
@@ -48,12 +48,6 @@ int av_fifo_size(AVFifoBuffer *f) | |||||
return (uint32_t)(f->wndx - f->rndx); | 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) { | int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) { | ||||
unsigned int old_size= f->end - f->buffer; | unsigned int old_size= f->end - f->buffer; | ||||
@@ -73,13 +67,6 @@ int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) { | |||||
return 0; | 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 av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int)) | ||||
{ | { | ||||
int total = size; | int total = size; | ||||
@@ -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); | 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. | * Feeds data from a user-supplied callback to an AVFifoBuffer. | ||||
* @param *f AVFifoBuffer to write to | * @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)); | 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. | * Resizes an AVFifoBuffer. | ||||
* @param *f AVFifoBuffer to resize | * @param *f AVFifoBuffer to resize | ||||
@@ -234,12 +234,6 @@ int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen) { | |||||
return c.error; | 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 | #ifdef TEST | ||||
#include <stdio.h> | #include <stdio.h> | ||||
#include <lzo/lzo1x.h> | #include <lzo/lzo1x.h> | ||||
@@ -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; | 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 |