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
b2ce3b99
Commit
b2ce3b99
authored
Dec 31, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields
parent
3167dc95
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
8 deletions
+7
-8
avconv.c
avconv.c
+7
-8
No files found.
avconv.c
View file @
b2ce3b99
...
...
@@ -1262,19 +1262,18 @@ static void do_video_resample(OutputStream *ost,
AVFrame
**
out_picture
)
{
int
resample_changed
=
0
;
AVCodecContext
*
dec
=
ist
->
st
->
codec
;
*
out_picture
=
in_picture
;
resample_changed
=
ost
->
resample_width
!=
dec
->
width
||
ost
->
resample_height
!=
dec
->
height
||
ost
->
resample_pix_fmt
!=
dec
->
pix_fm
t
;
resample_changed
=
ost
->
resample_width
!=
in_picture
->
width
||
ost
->
resample_height
!=
in_picture
->
height
||
ost
->
resample_pix_fmt
!=
in_picture
->
forma
t
;
if
(
resample_changed
)
{
av_log
(
NULL
,
AV_LOG_INFO
,
"Input stream #%d:%d frame changed from size:%dx%d fmt:%s to size:%dx%d fmt:%s
\n
"
,
ist
->
file_index
,
ist
->
st
->
index
,
ost
->
resample_width
,
ost
->
resample_height
,
av_get_pix_fmt_name
(
ost
->
resample_pix_fmt
),
dec
->
width
,
dec
->
height
,
av_get_pix_fmt_name
(
dec
->
pix_fm
t
));
in_picture
->
width
,
in_picture
->
height
,
av_get_pix_fmt_name
(
in_picture
->
forma
t
));
if
(
!
ost
->
video_resample
)
ost
->
video_resample
=
1
;
}
...
...
@@ -1301,9 +1300,9 @@ static void do_video_resample(OutputStream *ost,
0
,
ost
->
resample_height
,
(
*
out_picture
)
->
data
,
(
*
out_picture
)
->
linesize
);
}
if
(
resample_changed
)
{
ost
->
resample_width
=
dec
->
width
;
ost
->
resample_height
=
dec
->
height
;
ost
->
resample_pix_fmt
=
dec
->
pix_fm
t
;
ost
->
resample_width
=
in_picture
->
width
;
ost
->
resample_height
=
in_picture
->
height
;
ost
->
resample_pix_fmt
=
in_picture
->
forma
t
;
}
}
#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