# HG changeset patch # User benoit # Date 1256020801 0 # Node ID db1e4c61789aea86a53ccf20443a86497dffd744 # Parent 86c32a27f69a7318dd47953f576d155e568a1b65 Make url_resetbuf() assert on wrong flags passed and make it static on next version bump. See thread: [FFmpeg-devel] & vs. && Date: Mon, 12 Oct 2009 14:21:06 +0200 diff -r 86c32a27f69a -r db1e4c61789a avio.h --- a/avio.h Mon Oct 19 23:22:23 2009 +0000 +++ b/avio.h Tue Oct 20 06:40:01 2009 +0000 @@ -333,11 +333,13 @@ /** @warning must be called before any I/O */ int url_setbufsize(ByteIOContext *s, int buf_size); +#if LIBAVFORMAT_VERSION_MAJOR < 53 /** Reset the buffer for reading or writing. * @note Will drop any data currently in the buffer without transmitting it. * @param flags URL_RDONLY to set up the buffer for reading, or URL_WRONLY * to set up the buffer for writing. */ int url_resetbuf(ByteIOContext *s, int flags); +#endif /** @note when opened as read/write, the buffers are only used for writing */ diff -r 86c32a27f69a -r db1e4c61789a aviobuf.c --- a/aviobuf.c Mon Oct 19 23:22:23 2009 +0000 +++ b/aviobuf.c Tue Oct 20 06:40:01 2009 +0000 @@ -28,6 +28,9 @@ #define IO_BUFFER_SIZE 32768 static void fill_buffer(ByteIOContext *s); +#if LIBAVFORMAT_VERSION_MAJOR >= 53 +static int url_resetbuf(ByteIOContext *s, int flags); +#endif int init_put_byte(ByteIOContext *s, unsigned char *buffer, @@ -583,11 +586,19 @@ return 0; } +#if LIBAVFORMAT_VERSION_MAJOR < 53 int url_resetbuf(ByteIOContext *s, int flags) +#else +static int url_resetbuf(ByteIOContext *s, int flags) +#endif { +#if LIBAVFORMAT_VERSION_MAJOR < 53 URLContext *h = s->opaque; if ((flags & URL_RDWR) || (h && h->flags != flags && !h->flags & URL_RDWR)) return AVERROR(EINVAL); +#else + assert(flags == URL_WRONLY || flags == URL_RDONLY); +#endif if (flags & URL_WRONLY) { s->buf_end = s->buffer + s->buffer_size;