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
2439f2ca
Commit
2439f2ca
authored
Jan 12, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: remove disabled FF_API_OLD_AVIO cruft
parent
a17479df
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
1 addition
and
411 deletions
+1
-411
avio.c
libavformat/avio.c
+0
-111
avio.h
libavformat/avio.h
+0
-0
aviobuf.c
libavformat/aviobuf.c
+1
-289
options.c
libavformat/options.c
+0
-6
url.h
libavformat/url.h
+0
-2
version.h
libavformat/version.h
+0
-3
No files found.
libavformat/avio.c
View file @
2439f2ca
...
@@ -89,13 +89,6 @@ static int default_interrupt_cb(void);
...
@@ -89,13 +89,6 @@ static int default_interrupt_cb(void);
int
(
*
url_interrupt_cb
)(
void
)
=
default_interrupt_cb
;
int
(
*
url_interrupt_cb
)(
void
)
=
default_interrupt_cb
;
#endif
#endif
#if FF_API_OLD_AVIO
URLProtocol
*
av_protocol_next
(
URLProtocol
*
p
)
{
return
ffurl_protocol_next
(
p
);
}
#endif
const
char
*
avio_enum_protocols
(
void
**
opaque
,
int
output
)
const
char
*
avio_enum_protocols
(
void
**
opaque
,
int
output
)
{
{
URLProtocol
**
p
=
opaque
;
URLProtocol
**
p
=
opaque
;
...
@@ -168,9 +161,7 @@ static int url_alloc_for_protocol (URLContext **puc, struct URLProtocol *up,
...
@@ -168,9 +161,7 @@ static int url_alloc_for_protocol (URLContext **puc, struct URLProtocol *up,
int
ffurl_connect
(
URLContext
*
uc
,
AVDictionary
**
options
)
int
ffurl_connect
(
URLContext
*
uc
,
AVDictionary
**
options
)
{
{
int
err
=
int
err
=
#if !FF_API_OLD_AVIO
uc
->
prot
->
url_open2
?
uc
->
prot
->
url_open2
(
uc
,
uc
->
filename
,
uc
->
flags
,
options
)
:
uc
->
prot
->
url_open2
?
uc
->
prot
->
url_open2
(
uc
,
uc
->
filename
,
uc
->
flags
,
options
)
:
#endif
uc
->
prot
->
url_open
(
uc
,
uc
->
filename
,
uc
->
flags
);
uc
->
prot
->
url_open
(
uc
,
uc
->
filename
,
uc
->
flags
);
if
(
err
)
if
(
err
)
return
err
;
return
err
;
...
@@ -183,81 +174,6 @@ int ffurl_connect(URLContext* uc, AVDictionary **options)
...
@@ -183,81 +174,6 @@ int ffurl_connect(URLContext* uc, AVDictionary **options)
return
0
;
return
0
;
}
}
#if FF_API_OLD_AVIO
int
url_open_protocol
(
URLContext
**
puc
,
struct
URLProtocol
*
up
,
const
char
*
filename
,
int
flags
)
{
int
ret
;
ret
=
url_alloc_for_protocol
(
puc
,
up
,
filename
,
flags
,
NULL
);
if
(
ret
)
goto
fail
;
ret
=
ffurl_connect
(
*
puc
,
NULL
);
if
(
!
ret
)
return
0
;
fail:
ffurl_close
(
*
puc
);
*
puc
=
NULL
;
return
ret
;
}
int
url_alloc
(
URLContext
**
puc
,
const
char
*
filename
,
int
flags
)
{
return
ffurl_alloc
(
puc
,
filename
,
flags
,
NULL
);
}
int
url_connect
(
URLContext
*
uc
)
{
return
ffurl_connect
(
uc
,
NULL
);
}
int
url_open
(
URLContext
**
puc
,
const
char
*
filename
,
int
flags
)
{
return
ffurl_open
(
puc
,
filename
,
flags
,
NULL
,
NULL
);
}
int
url_read
(
URLContext
*
h
,
unsigned
char
*
buf
,
int
size
)
{
return
ffurl_read
(
h
,
buf
,
size
);
}
int
url_read_complete
(
URLContext
*
h
,
unsigned
char
*
buf
,
int
size
)
{
return
ffurl_read_complete
(
h
,
buf
,
size
);
}
int
url_write
(
URLContext
*
h
,
const
unsigned
char
*
buf
,
int
size
)
{
return
ffurl_write
(
h
,
buf
,
size
);
}
int64_t
url_seek
(
URLContext
*
h
,
int64_t
pos
,
int
whence
)
{
return
ffurl_seek
(
h
,
pos
,
whence
);
}
int
url_close
(
URLContext
*
h
)
{
return
ffurl_close
(
h
);
}
int64_t
url_filesize
(
URLContext
*
h
)
{
return
ffurl_size
(
h
);
}
int
url_get_file_handle
(
URLContext
*
h
)
{
return
ffurl_get_file_handle
(
h
);
}
int
url_get_max_packet_size
(
URLContext
*
h
)
{
return
h
->
max_packet_size
;
}
void
url_get_filename
(
URLContext
*
h
,
char
*
buf
,
int
buf_size
)
{
av_strlcpy
(
buf
,
h
->
filename
,
buf_size
);
}
void
url_set_interrupt_cb
(
URLInterruptCB
*
interrupt_cb
)
{
avio_set_interrupt_cb
(
interrupt_cb
);
}
int
av_register_protocol2
(
URLProtocol
*
protocol
,
int
size
)
{
return
ffurl_register_protocol
(
protocol
,
size
);
}
#endif
#define URL_SCHEME_CHARS \
#define URL_SCHEME_CHARS \
"abcdefghijklmnopqrstuvwxyz" \
"abcdefghijklmnopqrstuvwxyz" \
"ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
"ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
...
@@ -393,17 +309,6 @@ int ffurl_close(URLContext *h)
...
@@ -393,17 +309,6 @@ int ffurl_close(URLContext *h)
return
ret
;
return
ret
;
}
}
#if FF_API_OLD_AVIO
int
url_exist
(
const
char
*
filename
)
{
URLContext
*
h
;
if
(
ffurl_open
(
&
h
,
filename
,
AVIO_FLAG_READ
,
NULL
,
NULL
)
<
0
)
return
0
;
ffurl_close
(
h
);
return
1
;
}
#endif
int
avio_check
(
const
char
*
url
,
int
flags
)
int
avio_check
(
const
char
*
url
,
int
flags
)
{
{
URLContext
*
h
;
URLContext
*
h
;
...
@@ -471,19 +376,3 @@ int ff_check_interrupt(AVIOInterruptCB *cb)
...
@@ -471,19 +376,3 @@ int ff_check_interrupt(AVIOInterruptCB *cb)
#endif
#endif
}
}
#if FF_API_OLD_AVIO
int
av_url_read_pause
(
URLContext
*
h
,
int
pause
)
{
if
(
!
h
->
prot
->
url_read_pause
)
return
AVERROR
(
ENOSYS
);
return
h
->
prot
->
url_read_pause
(
h
,
pause
);
}
int64_t
av_url_read_seek
(
URLContext
*
h
,
int
stream_index
,
int64_t
timestamp
,
int
flags
)
{
if
(
!
h
->
prot
->
url_read_seek
)
return
AVERROR
(
ENOSYS
);
return
h
->
prot
->
url_read_seek
(
h
,
stream_index
,
timestamp
,
flags
);
}
#endif
libavformat/avio.h
View file @
2439f2ca
This diff is collapsed.
Click to expand it.
libavformat/aviobuf.c
View file @
2439f2ca
...
@@ -40,7 +40,6 @@
...
@@ -40,7 +40,6 @@
*/
*/
#define SHORT_SEEK_THRESHOLD 4096
#define SHORT_SEEK_THRESHOLD 4096
#if !FF_API_OLD_AVIO
static
void
*
ffio_url_child_next
(
void
*
obj
,
void
*
prev
)
static
void
*
ffio_url_child_next
(
void
*
obj
,
void
*
prev
)
{
{
AVIOContext
*
s
=
obj
;
AVIOContext
*
s
=
obj
;
...
@@ -64,7 +63,7 @@ const AVClass ffio_url_class = {
...
@@ -64,7 +63,7 @@ const AVClass ffio_url_class = {
.
child_next
=
ffio_url_child_next
,
.
child_next
=
ffio_url_child_next
,
.
child_class_next
=
ffio_url_child_class_next
,
.
child_class_next
=
ffio_url_child_class_next
,
};
};
#endif
static
void
fill_buffer
(
AVIOContext
*
s
);
static
void
fill_buffer
(
AVIOContext
*
s
);
static
int
url_resetbuf
(
AVIOContext
*
s
,
int
flags
);
static
int
url_resetbuf
(
AVIOContext
*
s
,
int
flags
);
...
@@ -89,9 +88,6 @@ int ffio_init_context(AVIOContext *s,
...
@@ -89,9 +88,6 @@ int ffio_init_context(AVIOContext *s,
s
->
must_flush
=
0
;
s
->
must_flush
=
0
;
s
->
eof_reached
=
0
;
s
->
eof_reached
=
0
;
s
->
error
=
0
;
s
->
error
=
0
;
#if FF_API_OLD_AVIO
s
->
is_streamed
=
0
;
#endif
s
->
seekable
=
AVIO_SEEKABLE_NORMAL
;
s
->
seekable
=
AVIO_SEEKABLE_NORMAL
;
s
->
max_packet_size
=
0
;
s
->
max_packet_size
=
0
;
s
->
update_checksum
=
NULL
;
s
->
update_checksum
=
NULL
;
...
@@ -104,33 +100,6 @@ int ffio_init_context(AVIOContext *s,
...
@@ -104,33 +100,6 @@ int ffio_init_context(AVIOContext *s,
return
0
;
return
0
;
}
}
#if FF_API_OLD_AVIO
int
init_put_byte
(
AVIOContext
*
s
,
unsigned
char
*
buffer
,
int
buffer_size
,
int
write_flag
,
void
*
opaque
,
int
(
*
read_packet
)(
void
*
opaque
,
uint8_t
*
buf
,
int
buf_size
),
int
(
*
write_packet
)(
void
*
opaque
,
uint8_t
*
buf
,
int
buf_size
),
int64_t
(
*
seek
)(
void
*
opaque
,
int64_t
offset
,
int
whence
))
{
return
ffio_init_context
(
s
,
buffer
,
buffer_size
,
write_flag
,
opaque
,
read_packet
,
write_packet
,
seek
);
}
AVIOContext
*
av_alloc_put_byte
(
unsigned
char
*
buffer
,
int
buffer_size
,
int
write_flag
,
void
*
opaque
,
int
(
*
read_packet
)(
void
*
opaque
,
uint8_t
*
buf
,
int
buf_size
),
int
(
*
write_packet
)(
void
*
opaque
,
uint8_t
*
buf
,
int
buf_size
),
int64_t
(
*
seek
)(
void
*
opaque
,
int64_t
offset
,
int
whence
))
{
return
avio_alloc_context
(
buffer
,
buffer_size
,
write_flag
,
opaque
,
read_packet
,
write_packet
,
seek
);
}
#endif
AVIOContext
*
avio_alloc_context
(
AVIOContext
*
avio_alloc_context
(
unsigned
char
*
buffer
,
unsigned
char
*
buffer
,
int
buffer_size
,
int
buffer_size
,
...
@@ -265,19 +234,6 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence)
...
@@ -265,19 +234,6 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence)
return
offset
;
return
offset
;
}
}
#if FF_API_OLD_AVIO
int
url_fskip
(
AVIOContext
*
s
,
int64_t
offset
)
{
int64_t
ret
=
avio_seek
(
s
,
offset
,
SEEK_CUR
);
return
ret
<
0
?
ret
:
0
;
}
int64_t
url_ftell
(
AVIOContext
*
s
)
{
return
avio_seek
(
s
,
0
,
SEEK_CUR
);
}
#endif
int64_t
avio_size
(
AVIOContext
*
s
)
int64_t
avio_size
(
AVIOContext
*
s
)
{
{
int64_t
size
;
int64_t
size
;
...
@@ -297,22 +253,6 @@ int64_t avio_size(AVIOContext *s)
...
@@ -297,22 +253,6 @@ int64_t avio_size(AVIOContext *s)
return
size
;
return
size
;
}
}
#if FF_API_OLD_AVIO
int
url_feof
(
AVIOContext
*
s
)
{
if
(
!
s
)
return
0
;
return
s
->
eof_reached
;
}
int
url_ferror
(
AVIOContext
*
s
)
{
if
(
!
s
)
return
0
;
return
s
->
error
;
}
#endif
void
avio_wl32
(
AVIOContext
*
s
,
unsigned
int
val
)
void
avio_wl32
(
AVIOContext
*
s
,
unsigned
int
val
)
{
{
avio_w8
(
s
,
val
);
avio_w8
(
s
,
val
);
...
@@ -329,143 +269,6 @@ void avio_wb32(AVIOContext *s, unsigned int val)
...
@@ -329,143 +269,6 @@ void avio_wb32(AVIOContext *s, unsigned int val)
avio_w8
(
s
,
val
);
avio_w8
(
s
,
val
);
}
}
#if FF_API_OLD_AVIO
void
put_strz
(
AVIOContext
*
s
,
const
char
*
str
)
{
avio_put_str
(
s
,
str
);
}
#define GET(name, type) \
type get_be ##name(AVIOContext *s) \
{\
return avio_rb ##name(s);\
}\
type get_le ##name(AVIOContext *s) \
{\
return avio_rl ##name(s);\
}
GET
(
16
,
unsigned
int
)
GET
(
24
,
unsigned
int
)
GET
(
32
,
unsigned
int
)
GET
(
64
,
uint64_t
)
#undef GET
#define PUT(name, type ) \
void put_le ##name(AVIOContext *s, type val)\
{\
avio_wl ##name(s, val);\
}\
void put_be ##name(AVIOContext *s, type val)\
{\
avio_wb ##name(s, val);\
}
PUT
(
16
,
unsigned
int
)
PUT
(
24
,
unsigned
int
)
PUT
(
32
,
unsigned
int
)
PUT
(
64
,
uint64_t
)
#undef PUT
int
get_byte
(
AVIOContext
*
s
)
{
return
avio_r8
(
s
);
}
int
get_buffer
(
AVIOContext
*
s
,
unsigned
char
*
buf
,
int
size
)
{
return
avio_read
(
s
,
buf
,
size
);
}
int
get_partial_buffer
(
AVIOContext
*
s
,
unsigned
char
*
buf
,
int
size
)
{
return
ffio_read_partial
(
s
,
buf
,
size
);
}
void
put_byte
(
AVIOContext
*
s
,
int
val
)
{
avio_w8
(
s
,
val
);
}
void
put_buffer
(
AVIOContext
*
s
,
const
unsigned
char
*
buf
,
int
size
)
{
avio_write
(
s
,
buf
,
size
);
}
void
put_nbyte
(
AVIOContext
*
s
,
int
b
,
int
count
)
{
ffio_fill
(
s
,
b
,
count
);
}
int
url_fopen
(
AVIOContext
**
s
,
const
char
*
filename
,
int
flags
)
{
return
avio_open
(
s
,
filename
,
flags
);
}
int
url_fclose
(
AVIOContext
*
s
)
{
return
avio_close
(
s
);
}
int64_t
url_fseek
(
AVIOContext
*
s
,
int64_t
offset
,
int
whence
)
{
return
avio_seek
(
s
,
offset
,
whence
);
}
int64_t
url_fsize
(
AVIOContext
*
s
)
{
return
avio_size
(
s
);
}
int
url_setbufsize
(
AVIOContext
*
s
,
int
buf_size
)
{
return
ffio_set_buf_size
(
s
,
buf_size
);
}
int
url_fprintf
(
AVIOContext
*
s
,
const
char
*
fmt
,
...)
{
va_list
ap
;
char
buf
[
4096
];
int
ret
;
va_start
(
ap
,
fmt
);
ret
=
vsnprintf
(
buf
,
sizeof
(
buf
),
fmt
,
ap
);
va_end
(
ap
);
avio_write
(
s
,
buf
,
strlen
(
buf
));
return
ret
;
}
void
put_flush_packet
(
AVIOContext
*
s
)
{
avio_flush
(
s
);
}
int
av_url_read_fpause
(
AVIOContext
*
s
,
int
pause
)
{
return
avio_pause
(
s
,
pause
);
}
int64_t
av_url_read_fseek
(
AVIOContext
*
s
,
int
stream_index
,
int64_t
timestamp
,
int
flags
)
{
return
avio_seek_time
(
s
,
stream_index
,
timestamp
,
flags
);
}
void
init_checksum
(
AVIOContext
*
s
,
unsigned
long
(
*
update_checksum
)(
unsigned
long
c
,
const
uint8_t
*
p
,
unsigned
int
len
),
unsigned
long
checksum
)
{
ffio_init_checksum
(
s
,
update_checksum
,
checksum
);
}
unsigned
long
get_checksum
(
AVIOContext
*
s
)
{
return
ffio_get_checksum
(
s
);
}
int
url_open_dyn_buf
(
AVIOContext
**
s
)
{
return
avio_open_dyn_buf
(
s
);
}
int
url_open_dyn_packet_buf
(
AVIOContext
**
s
,
int
max_packet_size
)
{
return
ffio_open_dyn_packet_buf
(
s
,
max_packet_size
);
}
int
url_close_dyn_buf
(
AVIOContext
*
s
,
uint8_t
**
pbuffer
)
{
return
avio_close_dyn_buf
(
s
,
pbuffer
);
}
int
url_fdopen
(
AVIOContext
**
s
,
URLContext
*
h
)
{
return
ffio_fdopen
(
s
,
h
);
}
#endif
int
avio_put_str
(
AVIOContext
*
s
,
const
char
*
str
)
int
avio_put_str
(
AVIOContext
*
s
,
const
char
*
str
)
{
{
int
len
=
1
;
int
len
=
1
;
...
@@ -548,15 +351,6 @@ void avio_wb24(AVIOContext *s, unsigned int val)
...
@@ -548,15 +351,6 @@ void avio_wb24(AVIOContext *s, unsigned int val)
avio_w8
(
s
,
val
);
avio_w8
(
s
,
val
);
}
}
#if FF_API_OLD_AVIO
void
put_tag
(
AVIOContext
*
s
,
const
char
*
tag
)
{
while
(
*
tag
)
{
avio_w8
(
s
,
*
tag
++
);
}
}
#endif
/* Input stream */
/* Input stream */
static
void
fill_buffer
(
AVIOContext
*
s
)
static
void
fill_buffer
(
AVIOContext
*
s
)
...
@@ -638,17 +432,6 @@ int avio_r8(AVIOContext *s)
...
@@ -638,17 +432,6 @@ int avio_r8(AVIOContext *s)
return
0
;
return
0
;
}
}
#if FF_API_OLD_AVIO
int
url_fgetc
(
AVIOContext
*
s
)
{
if
(
s
->
buf_ptr
>=
s
->
buf_end
)
fill_buffer
(
s
);
if
(
s
->
buf_ptr
<
s
->
buf_end
)
return
*
s
->
buf_ptr
++
;
return
URL_EOF
;
}
#endif
int
avio_read
(
AVIOContext
*
s
,
unsigned
char
*
buf
,
int
size
)
int
avio_read
(
AVIOContext
*
s
,
unsigned
char
*
buf
,
int
size
)
{
{
int
len
,
size1
;
int
len
,
size1
;
...
@@ -774,14 +557,6 @@ unsigned int avio_rb32(AVIOContext *s)
...
@@ -774,14 +557,6 @@ unsigned int avio_rb32(AVIOContext *s)
return
val
;
return
val
;
}
}
#if FF_API_OLD_AVIO
char
*
get_strz
(
AVIOContext
*
s
,
char
*
buf
,
int
maxlen
)
{
avio_get_str
(
s
,
INT_MAX
,
buf
,
maxlen
);
return
buf
;
}
#endif
int
ff_get_line
(
AVIOContext
*
s
,
char
*
buf
,
int
maxlen
)
int
ff_get_line
(
AVIOContext
*
s
,
char
*
buf
,
int
maxlen
)
{
{
int
i
=
0
;
int
i
=
0
;
...
@@ -879,18 +654,13 @@ int ffio_fdopen(AVIOContext **s, URLContext *h)
...
@@ -879,18 +654,13 @@ int ffio_fdopen(AVIOContext **s, URLContext *h)
av_free
(
buffer
);
av_free
(
buffer
);
return
AVERROR
(
ENOMEM
);
return
AVERROR
(
ENOMEM
);
}
}
#if FF_API_OLD_AVIO
(
*
s
)
->
is_streamed
=
h
->
is_streamed
;
#endif
(
*
s
)
->
seekable
=
h
->
is_streamed
?
0
:
AVIO_SEEKABLE_NORMAL
;
(
*
s
)
->
seekable
=
h
->
is_streamed
?
0
:
AVIO_SEEKABLE_NORMAL
;
(
*
s
)
->
max_packet_size
=
max_packet_size
;
(
*
s
)
->
max_packet_size
=
max_packet_size
;
if
(
h
->
prot
)
{
if
(
h
->
prot
)
{
(
*
s
)
->
read_pause
=
(
int
(
*
)(
void
*
,
int
))
h
->
prot
->
url_read_pause
;
(
*
s
)
->
read_pause
=
(
int
(
*
)(
void
*
,
int
))
h
->
prot
->
url_read_pause
;
(
*
s
)
->
read_seek
=
(
int64_t
(
*
)(
void
*
,
int
,
int64_t
,
int
))
h
->
prot
->
url_read_seek
;
(
*
s
)
->
read_seek
=
(
int64_t
(
*
)(
void
*
,
int
,
int64_t
,
int
))
h
->
prot
->
url_read_seek
;
}
}
#if !FF_API_OLD_AVIO
(
*
s
)
->
av_class
=
&
ffio_url_class
;
(
*
s
)
->
av_class
=
&
ffio_url_class
;
#endif
return
0
;
return
0
;
}
}
...
@@ -993,13 +763,6 @@ int avio_close(AVIOContext *s)
...
@@ -993,13 +763,6 @@ int avio_close(AVIOContext *s)
return
ffurl_close
(
h
);
return
ffurl_close
(
h
);
}
}
#if FF_API_OLD_AVIO
URLContext
*
url_fileno
(
AVIOContext
*
s
)
{
return
s
->
opaque
;
}
#endif
int
avio_printf
(
AVIOContext
*
s
,
const
char
*
fmt
,
...)
int
avio_printf
(
AVIOContext
*
s
,
const
char
*
fmt
,
...)
{
{
va_list
ap
;
va_list
ap
;
...
@@ -1013,34 +776,6 @@ int avio_printf(AVIOContext *s, const char *fmt, ...)
...
@@ -1013,34 +776,6 @@ int avio_printf(AVIOContext *s, const char *fmt, ...)
return
ret
;
return
ret
;
}
}
#if FF_API_OLD_AVIO
char
*
url_fgets
(
AVIOContext
*
s
,
char
*
buf
,
int
buf_size
)
{
int
c
;
char
*
q
;
c
=
avio_r8
(
s
);
if
(
s
->
eof_reached
)
return
NULL
;
q
=
buf
;
for
(;;)
{
if
(
s
->
eof_reached
||
c
==
'\n'
)
break
;
if
((
q
-
buf
)
<
buf_size
-
1
)
*
q
++
=
c
;
c
=
avio_r8
(
s
);
}
if
(
buf_size
>
0
)
*
q
=
'\0'
;
return
buf
;
}
int
url_fget_max_packet_size
(
AVIOContext
*
s
)
{
return
s
->
max_packet_size
;
}
#endif
int
avio_pause
(
AVIOContext
*
s
,
int
pause
)
int
avio_pause
(
AVIOContext
*
s
,
int
pause
)
{
{
if
(
!
s
->
read_pause
)
if
(
!
s
->
read_pause
)
...
@@ -1068,29 +803,6 @@ int64_t avio_seek_time(AVIOContext *s, int stream_index,
...
@@ -1068,29 +803,6 @@ int64_t avio_seek_time(AVIOContext *s, int stream_index,
return
ret
;
return
ret
;
}
}
/* buffer handling */
#if FF_API_OLD_AVIO
int
url_open_buf
(
AVIOContext
**
s
,
uint8_t
*
buf
,
int
buf_size
,
int
flags
)
{
int
ret
;
*
s
=
av_mallocz
(
sizeof
(
AVIOContext
));
if
(
!*
s
)
return
AVERROR
(
ENOMEM
);
ret
=
ffio_init_context
(
*
s
,
buf
,
buf_size
,
flags
&
AVIO_FLAG_WRITE
,
NULL
,
NULL
,
NULL
,
NULL
);
if
(
ret
!=
0
)
av_freep
(
s
);
return
ret
;
}
int
url_close_buf
(
AVIOContext
*
s
)
{
avio_flush
(
s
);
return
s
->
buf_ptr
-
s
->
buffer
;
}
#endif
/* output in a dynamic buffer */
/* output in a dynamic buffer */
typedef
struct
DynBuffer
{
typedef
struct
DynBuffer
{
...
...
libavformat/options.c
View file @
2439f2ca
...
@@ -41,10 +41,8 @@ static void *format_child_next(void *obj, void *prev)
...
@@ -41,10 +41,8 @@ static void *format_child_next(void *obj, void *prev)
((
s
->
iformat
&&
s
->
iformat
->
priv_class
)
||
((
s
->
iformat
&&
s
->
iformat
->
priv_class
)
||
s
->
oformat
&&
s
->
oformat
->
priv_class
))
s
->
oformat
&&
s
->
oformat
->
priv_class
))
return
s
->
priv_data
;
return
s
->
priv_data
;
#if !FF_API_OLD_AVIO
if
(
s
->
pb
&&
s
->
pb
->
av_class
&&
prev
!=
s
->
pb
)
if
(
s
->
pb
&&
s
->
pb
->
av_class
&&
prev
!=
s
->
pb
)
return
s
->
pb
;
return
s
->
pb
;
#endif
return
NULL
;
return
NULL
;
}
}
...
@@ -54,11 +52,7 @@ static const AVClass *format_child_class_next(const AVClass *prev)
...
@@ -54,11 +52,7 @@ static const AVClass *format_child_class_next(const AVClass *prev)
AVOutputFormat
*
ofmt
=
NULL
;
AVOutputFormat
*
ofmt
=
NULL
;
if
(
!
prev
)
if
(
!
prev
)
#if !FF_API_OLD_AVIO
return
&
ffio_url_class
;
return
&
ffio_url_class
;
#else
prev
=
(
void
*
)
&
ifmt
;
// Dummy pointer;
#endif
while
((
ifmt
=
av_iformat_next
(
ifmt
)))
while
((
ifmt
=
av_iformat_next
(
ifmt
)))
if
(
ifmt
->
priv_class
==
prev
)
if
(
ifmt
->
priv_class
==
prev
)
...
...
libavformat/url.h
View file @
2439f2ca
...
@@ -31,7 +31,6 @@
...
@@ -31,7 +31,6 @@
#include "libavutil/dict.h"
#include "libavutil/dict.h"
#include "libavutil/log.h"
#include "libavutil/log.h"
#if !FF_API_OLD_AVIO
#define URL_PROTOCOL_FLAG_NESTED_SCHEME 1
/*< The protocol name can be the first part of a nested protocol scheme */
#define URL_PROTOCOL_FLAG_NESTED_SCHEME 1
/*< The protocol name can be the first part of a nested protocol scheme */
#define URL_PROTOCOL_FLAG_NETWORK 2
/*< The protocol uses network */
#define URL_PROTOCOL_FLAG_NETWORK 2
/*< The protocol uses network */
...
@@ -74,7 +73,6 @@ typedef struct URLProtocol {
...
@@ -74,7 +73,6 @@ typedef struct URLProtocol {
int
flags
;
int
flags
;
int
(
*
url_check
)(
URLContext
*
h
,
int
mask
);
int
(
*
url_check
)(
URLContext
*
h
,
int
mask
);
}
URLProtocol
;
}
URLProtocol
;
#endif
/**
/**
* Create a URLContext for accessing to the resource indicated by
* Create a URLContext for accessing to the resource indicated by
...
...
libavformat/version.h
View file @
2439f2ca
...
@@ -50,9 +50,6 @@
...
@@ -50,9 +50,6 @@
#ifndef FF_API_OLD_METADATA2
#ifndef FF_API_OLD_METADATA2
#define FF_API_OLD_METADATA2 (LIBAVFORMAT_VERSION_MAJOR < 54)
#define FF_API_OLD_METADATA2 (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#endif
#ifndef FF_API_OLD_AVIO
#define FF_API_OLD_AVIO (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_DUMP_FORMAT
#ifndef FF_API_DUMP_FORMAT
#define FF_API_DUMP_FORMAT (LIBAVFORMAT_VERSION_MAJOR < 54)
#define FF_API_DUMP_FORMAT (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#endif
...
...
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