RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove more functions disabled by major version bump. 

Originally committed as revision 17876 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2009-03-08 15:02:12 +00:00
parent 3fb1084306
commit fe4032b66a
4 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavutil/fifo.c
View File

@ -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;

20
libavutil/fifo.h
View File

@ -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

6
libavutil/lzo.c
View File

@ -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>

8
libavutil/rc4.c
View File

@ -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