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
e4f4d99d
Commit
e4f4d99d
authored
Aug 09, 2012
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: make -s work for subtitles too.
Some codecs allow to encode the frame size and some players use it.
parent
17e40236
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
1 deletion
+11
-1
ffmpeg_opt.c
ffmpeg_opt.c
+11
-1
No files found.
ffmpeg_opt.c
View file @
e4f4d99d
...
...
@@ -1218,6 +1218,16 @@ static OutputStream *new_subtitle_stream(OptionsContext *o, AVFormatContext *oc,
MATCH_PER_STREAM_OPT
(
copy_initial_nonkeyframes
,
i
,
ost
->
copy_initial_nonkeyframes
,
oc
,
st
);
if
(
!
ost
->
stream_copy
)
{
char
*
frame_size
=
NULL
;
MATCH_PER_STREAM_OPT
(
frame_sizes
,
str
,
frame_size
,
oc
,
st
);
if
(
frame_size
&&
av_parse_video_size
(
&
subtitle_enc
->
width
,
&
subtitle_enc
->
height
,
frame_size
)
<
0
)
{
av_log
(
NULL
,
AV_LOG_FATAL
,
"Invalid frame size: %s.
\n
"
,
frame_size
);
exit_program
(
1
);
}
}
return
ost
;
}
...
...
@@ -2219,7 +2229,7 @@ const OptionDef options[] = {
/* video options */
{
"vframes"
,
HAS_ARG
|
OPT_VIDEO
|
OPT_FUNC2
,
{(
void
*
)
opt_video_frames
},
"set the number of video frames to record"
,
"number"
},
{
"r"
,
HAS_ARG
|
OPT_VIDEO
|
OPT_STRING
|
OPT_SPEC
,
{.
off
=
OFFSET
(
frame_rates
)},
"set frame rate (Hz value, fraction or abbreviation)"
,
"rate"
},
{
"s"
,
HAS_ARG
|
OPT_VIDEO
|
OPT_STRING
|
OPT_SPEC
,
{.
off
=
OFFSET
(
frame_sizes
)},
"set frame size (WxH or abbreviation)"
,
"size"
},
{
"s"
,
HAS_ARG
|
OPT_VIDEO
|
OPT_S
UBTITLE
|
OPT_S
TRING
|
OPT_SPEC
,
{.
off
=
OFFSET
(
frame_sizes
)},
"set frame size (WxH or abbreviation)"
,
"size"
},
{
"aspect"
,
HAS_ARG
|
OPT_VIDEO
|
OPT_STRING
|
OPT_SPEC
,
{.
off
=
OFFSET
(
frame_aspect_ratios
)},
"set aspect ratio (4:3, 16:9 or 1.3333, 1.7777)"
,
"aspect"
},
{
"pix_fmt"
,
HAS_ARG
|
OPT_EXPERT
|
OPT_VIDEO
|
OPT_STRING
|
OPT_SPEC
,
{.
off
=
OFFSET
(
frame_pix_fmts
)},
"set pixel format"
,
"format"
},
{
"bits_per_raw_sample"
,
OPT_INT
|
HAS_ARG
|
OPT_VIDEO
,
{(
void
*
)
&
frame_bits_per_raw_sample
},
"set the number of bits per raw sample"
,
"number"
},
...
...
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