[10/13] avio: always compile avio_printf, rather than on CONFIG_MUXERS

Message ID 1300131546-2880-10-git-send-email-anton@khirnov.net
State Committed
Commit eda4cf92d795ae7e233e83f5ad37209d475b7805
Headers show

Commit Message

Anton Khirnov March 14, 2011, 7:39 p.m.
---
 libavformat/aviobuf.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

Comments

Ronald Bultje March 17, 2011, 2:47 a.m. | #1
Hi,

2011/3/14 Anton Khirnov <anton@khirnov.net>:
> ---
>  libavformat/aviobuf.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
> index 8af3ecb..0da445a 100644
> --- a/libavformat/aviobuf.c
> +++ b/libavformat/aviobuf.c
> @@ -939,7 +939,6 @@ URLContext *url_fileno(AVIOContext *s)
>     return s->opaque;
>  }
>
> -#if CONFIG_MUXERS
>  int avio_printf(AVIOContext *s, const char *fmt, ...)
>  {
>     va_list ap;
> @@ -952,7 +951,6 @@ int avio_printf(AVIOContext *s, const char *fmt, ...)
>     avio_write(s, buf, strlen(buf));
>     return ret;
>  }
> -#endif //CONFIG_MUXERS
>
>  #if FF_API_OLD_AVIO
>  char *url_fgets(AVIOContext *s, char *buf, int buf_size)
> --
> 1.7.4.1

As part of our external API, yes.

Ronald

Patch

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 8af3ecb..0da445a 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -939,7 +939,6 @@  URLContext *url_fileno(AVIOContext *s)
     return s->opaque;
 }
 
-#if CONFIG_MUXERS
 int avio_printf(AVIOContext *s, const char *fmt, ...)
 {
     va_list ap;
@@ -952,7 +951,6 @@  int avio_printf(AVIOContext *s, const char *fmt, ...)
     avio_write(s, buf, strlen(buf));
     return ret;
 }
-#endif //CONFIG_MUXERS
 
 #if FF_API_OLD_AVIO
 char *url_fgets(AVIOContext *s, char *buf, int buf_size)