On 05/04/2011 02:55 PM, Diego Biurrun wrote:
> file_check() is not only used by the file protocol, adjust #ifdef accordingly.
> ---
> libavformat/file.c | 26 +++++++++++++-------------
> 1 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/libavformat/file.c b/libavformat/file.c
> index 6a3ed5a..649640a 100644
> --- a/libavformat/file.c
> +++ b/libavformat/file.c
> @@ -51,6 +51,19 @@ static int file_get_handle(URLContext *h)
> return (intptr_t) h->priv_data;
> }
>
> +static int file_check(URLContext *h, int mask)
> +{
> + struct stat st;
> + int ret = stat(h->filename, &st);
> + if (ret < 0)
> + return AVERROR(errno);
> +
> + ret |= st.st_mode&S_IRUSR ? mask&AVIO_FLAG_READ : 0;
> + ret |= st.st_mode&S_IWUSR ? mask&AVIO_FLAG_WRITE : 0;
> +
> + return ret;
> +}
> +
> #if CONFIG_FILE_PROTOCOL
>
> static int file_open(URLContext *h, const char *filename, int flags)
> @@ -95,19 +108,6 @@ static int file_close(URLContext *h)
> return close(fd);
> }
>
> -static int file_check(URLContext *h, int mask)
> -{
> - struct stat st;
> - int ret = stat(h->filename, &st);
> - if (ret < 0)
> - return AVERROR(errno);
> -
> - ret |= st.st_mode&S_IRUSR ? mask&AVIO_FLAG_READ : 0;
> - ret |= st.st_mode&S_IWUSR ? mask&AVIO_FLAG_WRITE : 0;
> -
> - return ret;
> -}
> -
> URLProtocol ff_file_protocol = {
> .name = "file",
> .url_open = file_open,
ok.
-Justin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
