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
60de7616
Commit
60de7616
authored
May 31, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: allow overriding input top field first
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
824a6975
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
0 deletions
+7
-0
ffmpeg.c
ffmpeg.c
+7
-0
No files found.
ffmpeg.c
View file @
60de7616
...
@@ -237,6 +237,7 @@ typedef struct InputStream {
...
@@ -237,6 +237,7 @@ typedef struct InputStream {
int
showed_multi_packet_warning
;
int
showed_multi_packet_warning
;
AVDictionary
*
opts
;
AVDictionary
*
opts
;
AVRational
framerate
;
/* framerate forced with -r */
AVRational
framerate
;
/* framerate forced with -r */
int
top_field_first
;
int
resample_height
;
int
resample_height
;
int
resample_width
;
int
resample_width
;
...
@@ -2574,6 +2575,9 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
...
@@ -2574,6 +2575,9 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
return
ret
;
return
ret
;
}
}
if
(
ist
->
top_field_first
>=
0
)
decoded_frame
->
top_field_first
=
ist
->
top_field_first
;
best_effort_timestamp
=
av_frame_get_best_effort_timestamp
(
decoded_frame
);
best_effort_timestamp
=
av_frame_get_best_effort_timestamp
(
decoded_frame
);
if
(
best_effort_timestamp
!=
AV_NOPTS_VALUE
)
if
(
best_effort_timestamp
!=
AV_NOPTS_VALUE
)
ist
->
next_pts
=
ist
->
pts
=
av_rescale_q
(
decoded_frame
->
pts
=
best_effort_timestamp
,
ist
->
st
->
time_base
,
AV_TIME_BASE_Q
);
ist
->
next_pts
=
ist
->
pts
=
av_rescale_q
(
decoded_frame
->
pts
=
best_effort_timestamp
,
ist
->
st
->
time_base
,
AV_TIME_BASE_Q
);
...
@@ -4082,6 +4086,9 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
...
@@ -4082,6 +4086,9 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
exit_program
(
1
);
exit_program
(
1
);
}
}
ist
->
top_field_first
=
-
1
;
MATCH_PER_STREAM_OPT
(
top_field_first
,
i
,
ist
->
top_field_first
,
ic
,
st
);
break
;
break
;
case
AVMEDIA_TYPE_AUDIO
:
case
AVMEDIA_TYPE_AUDIO
:
guess_input_channel_layout
(
ist
);
guess_input_channel_layout
(
ist
);
...
...
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