Browse Source

avio: make url_filesize() internal.

tags/n0.8
Anton Khirnov 14 years ago
parent
commit
32a97d4630
4 changed files with 14 additions and 9 deletions
  1. +5
    -1
      libavformat/avio.c
  2. +1
    -7
      libavformat/avio.h
  3. +1
    -1
      libavformat/concat.c
  4. +7
    -0
      libavformat/url.h

+ 5
- 1
libavformat/avio.c View File

@@ -200,6 +200,10 @@ int url_close(URLContext *h)
{
return ffurl_close(h);
}
int64_t url_filesize(URLContext *h)
{
return ffurl_size(h);
}
#endif

#define URL_SCHEME_CHARS \
@@ -338,7 +342,7 @@ int url_exist(const char *filename)
return 1;
}

int64_t url_filesize(URLContext *h)
int64_t ffurl_size(URLContext *h)
{
int64_t pos, size;



+ 1
- 7
libavformat/avio.h View File

@@ -110,6 +110,7 @@ attribute_deprecated int url_read_complete(URLContext *h, unsigned char *buf, in
attribute_deprecated int url_write(URLContext *h, const unsigned char *buf, int size);
attribute_deprecated int64_t url_seek(URLContext *h, int64_t pos, int whence);
attribute_deprecated int url_close(URLContext *h);
attribute_deprecated int64_t url_filesize(URLContext *h);
#endif

/**
@@ -118,13 +119,6 @@ attribute_deprecated int url_close(URLContext *h);
*/
int url_exist(const char *url);

/**
* Return the filesize of the resource accessed by h, AVERROR(ENOSYS)
* if the operation is not supported by h, or another negative value
* corresponding to an AVERROR error code in case of failure.
*/
int64_t url_filesize(URLContext *h);

/**
* Return the file descriptor associated with this URL. For RTP, this
* will return only the RTP file descriptor, not the RTCP file descriptor.


+ 1
- 1
libavformat/concat.c View File

@@ -105,7 +105,7 @@ static av_cold int concat_open(URLContext *h, const char *uri, int flags)
break;

/* creating size */
if ((size = url_filesize(uc)) < 0) {
if ((size = ffurl_size(uc)) < 0) {
ffurl_close(uc);
err = AVERROR(ENOSYS);
break;


+ 7
- 0
libavformat/url.h View File

@@ -111,4 +111,11 @@ int64_t ffurl_seek(URLContext *h, int64_t pos, int whence);
*/
int ffurl_close(URLContext *h);

/**
* Return the filesize of the resource accessed by h, AVERROR(ENOSYS)
* if the operation is not supported by h, or another negative value
* corresponding to an AVERROR error code in case of failure.
*/
int64_t ffurl_size(URLContext *h);

#endif //AVFORMAT_URL_H

Loading…
Cancel
Save