Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
32a97d46
Commit
32a97d46
authored
Mar 31, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avio: make url_filesize() internal.
parent
e52a9145
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
9 deletions
+14
-9
avio.c
libavformat/avio.c
+5
-1
avio.h
libavformat/avio.h
+1
-7
concat.c
libavformat/concat.c
+1
-1
url.h
libavformat/url.h
+7
-0
No files found.
libavformat/avio.c
View file @
32a97d46
...
@@ -200,6 +200,10 @@ int url_close(URLContext *h)
...
@@ -200,6 +200,10 @@ int url_close(URLContext *h)
{
{
return
ffurl_close
(
h
);
return
ffurl_close
(
h
);
}
}
int64_t
url_filesize
(
URLContext
*
h
)
{
return
ffurl_size
(
h
);
}
#endif
#endif
#define URL_SCHEME_CHARS \
#define URL_SCHEME_CHARS \
...
@@ -338,7 +342,7 @@ int url_exist(const char *filename)
...
@@ -338,7 +342,7 @@ int url_exist(const char *filename)
return
1
;
return
1
;
}
}
int64_t
url_file
size
(
URLContext
*
h
)
int64_t
ffurl_
size
(
URLContext
*
h
)
{
{
int64_t
pos
,
size
;
int64_t
pos
,
size
;
...
...
libavformat/avio.h
View file @
32a97d46
...
@@ -110,6 +110,7 @@ attribute_deprecated int url_read_complete(URLContext *h, unsigned char *buf, in
...
@@ -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
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
int64_t
url_seek
(
URLContext
*
h
,
int64_t
pos
,
int
whence
);
attribute_deprecated
int
url_close
(
URLContext
*
h
);
attribute_deprecated
int
url_close
(
URLContext
*
h
);
attribute_deprecated
int64_t
url_filesize
(
URLContext
*
h
);
#endif
#endif
/**
/**
...
@@ -118,13 +119,6 @@ attribute_deprecated int url_close(URLContext *h);
...
@@ -118,13 +119,6 @@ attribute_deprecated int url_close(URLContext *h);
*/
*/
int
url_exist
(
const
char
*
url
);
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
* Return the file descriptor associated with this URL. For RTP, this
* will return only the RTP file descriptor, not the RTCP file descriptor.
* will return only the RTP file descriptor, not the RTCP file descriptor.
...
...
libavformat/concat.c
View file @
32a97d46
...
@@ -105,7 +105,7 @@ static av_cold int concat_open(URLContext *h, const char *uri, int flags)
...
@@ -105,7 +105,7 @@ static av_cold int concat_open(URLContext *h, const char *uri, int flags)
break
;
break
;
/* creating size */
/* creating size */
if
((
size
=
url_file
size
(
uc
))
<
0
)
{
if
((
size
=
ffurl_
size
(
uc
))
<
0
)
{
ffurl_close
(
uc
);
ffurl_close
(
uc
);
err
=
AVERROR
(
ENOSYS
);
err
=
AVERROR
(
ENOSYS
);
break
;
break
;
...
...
libavformat/url.h
View file @
32a97d46
...
@@ -111,4 +111,11 @@ int64_t ffurl_seek(URLContext *h, int64_t pos, int whence);
...
@@ -111,4 +111,11 @@ int64_t ffurl_seek(URLContext *h, int64_t pos, int whence);
*/
*/
int
ffurl_close
(
URLContext
*
h
);
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
#endif //AVFORMAT_URL_H
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment