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
12db891d
Commit
12db891d
authored
Jun 15, 2013
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avf: move ff_write_chained to mux.c
parent
508998f7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
18 deletions
+18
-18
mux.c
libavformat/mux.c
+18
-0
utils.c
libavformat/utils.c
+0
-18
No files found.
libavformat/mux.c
View file @
12db891d
...
@@ -621,3 +621,21 @@ fail:
...
@@ -621,3 +621,21 @@ fail:
av_freep
(
&
s
->
priv_data
);
av_freep
(
&
s
->
priv_data
);
return
ret
;
return
ret
;
}
}
int
ff_write_chained
(
AVFormatContext
*
dst
,
int
dst_stream
,
AVPacket
*
pkt
,
AVFormatContext
*
src
)
{
AVPacket
local_pkt
;
local_pkt
=
*
pkt
;
local_pkt
.
stream_index
=
dst_stream
;
if
(
pkt
->
pts
!=
AV_NOPTS_VALUE
)
local_pkt
.
pts
=
av_rescale_q
(
pkt
->
pts
,
src
->
streams
[
pkt
->
stream_index
]
->
time_base
,
dst
->
streams
[
dst_stream
]
->
time_base
);
if
(
pkt
->
dts
!=
AV_NOPTS_VALUE
)
local_pkt
.
dts
=
av_rescale_q
(
pkt
->
dts
,
src
->
streams
[
pkt
->
stream_index
]
->
time_base
,
dst
->
streams
[
dst_stream
]
->
time_base
);
return
av_write_frame
(
dst
,
&
local_pkt
);
}
libavformat/utils.c
View file @
12db891d
...
@@ -3153,24 +3153,6 @@ int ff_url_join(char *str, int size, const char *proto,
...
@@ -3153,24 +3153,6 @@ int ff_url_join(char *str, int size, const char *proto,
return
strlen
(
str
);
return
strlen
(
str
);
}
}
int
ff_write_chained
(
AVFormatContext
*
dst
,
int
dst_stream
,
AVPacket
*
pkt
,
AVFormatContext
*
src
)
{
AVPacket
local_pkt
;
local_pkt
=
*
pkt
;
local_pkt
.
stream_index
=
dst_stream
;
if
(
pkt
->
pts
!=
AV_NOPTS_VALUE
)
local_pkt
.
pts
=
av_rescale_q
(
pkt
->
pts
,
src
->
streams
[
pkt
->
stream_index
]
->
time_base
,
dst
->
streams
[
dst_stream
]
->
time_base
);
if
(
pkt
->
dts
!=
AV_NOPTS_VALUE
)
local_pkt
.
dts
=
av_rescale_q
(
pkt
->
dts
,
src
->
streams
[
pkt
->
stream_index
]
->
time_base
,
dst
->
streams
[
dst_stream
]
->
time_base
);
return
av_write_frame
(
dst
,
&
local_pkt
);
}
void
ff_parse_key_value
(
const
char
*
str
,
ff_parse_key_val_cb
callback_get_buf
,
void
ff_parse_key_value
(
const
char
*
str
,
ff_parse_key_val_cb
callback_get_buf
,
void
*
context
)
void
*
context
)
{
{
...
...
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