Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
836ce905
Commit
836ce905
authored
Mar 29, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avconv: move filtered_frame from InputStream to OutputStream.
It more properly belongs to output, not input.
parent
6c9eac19
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
avconv.c
avconv.c
+5
-5
No files found.
avconv.c
View file @
836ce905
...
...
@@ -165,7 +165,6 @@ typedef struct InputStream {
int
decoding_needed
;
/* true if the packets must be decoded in 'raw_fifo' */
AVCodec
*
dec
;
AVFrame
*
decoded_frame
;
AVFrame
*
filtered_frame
;
int64_t
start
;
/* time when read started */
/* predicted dts of the next packet read for this stream or (when there are
...
...
@@ -217,6 +216,7 @@ typedef struct OutputStream {
AVCodec
*
enc
;
int64_t
max_frames
;
AVFrame
*
output_frame
;
AVFrame
*
filtered_frame
;
/* video only */
AVRational
frame_rate
;
...
...
@@ -700,6 +700,7 @@ void exit_program(int ret)
}
av_freep
(
&
output_streams
[
i
]
->
avfilter
);
av_freep
(
&
output_streams
[
i
]
->
filtered_frame
);
av_freep
(
&
output_streams
[
i
]);
}
for
(
i
=
0
;
i
<
nb_input_files
;
i
++
)
{
...
...
@@ -708,7 +709,6 @@ void exit_program(int ret)
}
for
(
i
=
0
;
i
<
nb_input_streams
;
i
++
)
{
av_freep
(
&
input_streams
[
i
]
->
decoded_frame
);
av_freep
(
&
input_streams
[
i
]
->
filtered_frame
);
av_dict_free
(
&
input_streams
[
i
]
->
opts
);
free_buffer_pool
(
input_streams
[
i
]);
av_freep
(
&
input_streams
[
i
]);
...
...
@@ -1950,12 +1950,12 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
av_vsrc_buffer_add_frame
(
ost
->
input_video_filter
,
decoded_frame
,
decoded_frame
->
pts
,
decoded_frame
->
sample_aspect_ratio
);
if
(
!
ist
->
filtered_frame
&&
!
(
i
st
->
filtered_frame
=
avcodec_alloc_frame
()))
{
if
(
!
ost
->
filtered_frame
&&
!
(
o
st
->
filtered_frame
=
avcodec_alloc_frame
()))
{
ret
=
AVERROR
(
ENOMEM
);
goto
fail
;
}
else
avcodec_get_frame_defaults
(
i
st
->
filtered_frame
);
filtered_frame
=
i
st
->
filtered_frame
;
avcodec_get_frame_defaults
(
o
st
->
filtered_frame
);
filtered_frame
=
o
st
->
filtered_frame
;
frame_available
=
avfilter_poll_frame
(
ost
->
output_video_filter
->
inputs
[
0
]);
while
(
frame_available
)
{
...
...
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