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
e93ca480
Commit
e93ca480
authored
Jul 16, 2015
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
parseutil: Add more resolution aliases
Add DCI 2k and 4k and uhd1 and uhd2.
parent
69b92f1b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
avconv.texi
doc/avconv.texi
+8
-0
parseutils.c
libavutil/parseutils.c
+4
-0
No files found.
doc/avconv.texi
View file @
e93ca480
...
@@ -493,6 +493,14 @@ abbreviations are recognized:
...
@@ -493,6 +493,14 @@ abbreviations are recognized:
1280x720
1280x720
@item hd1080
@item hd1080
1920x1080
1920x1080
@item 2kdci
2048x1080
@item 4kdci
4096x2160
@item uhd1
3840x2160
@item uhd2
7680x4320
@end table
@end table
@item -aspect[:@var
{
stream
_
specifier
}
] @var
{
aspect
}
(@emph
{
output,per-stream
}
)
@item -aspect[:@var
{
stream
_
specifier
}
] @var
{
aspect
}
(@emph
{
output,per-stream
}
)
...
...
libavutil/parseutils.c
View file @
e93ca480
...
@@ -80,6 +80,10 @@ static const VideoSizeAbbr video_size_abbrs[] = {
...
@@ -80,6 +80,10 @@ static const VideoSizeAbbr video_size_abbrs[] = {
{
"hd480"
,
852
,
480
},
{
"hd480"
,
852
,
480
},
{
"hd720"
,
1280
,
720
},
{
"hd720"
,
1280
,
720
},
{
"hd1080"
,
1920
,
1080
},
{
"hd1080"
,
1920
,
1080
},
{
"2kdci"
,
2048
,
1080
},
{
"4kdci"
,
4096
,
2160
},
{
"uhd1"
,
3840
,
2160
},
{
"uhd2"
,
7680
,
4320
},
};
};
static
const
VideoRateAbbr
video_rate_abbrs
[]
=
{
static
const
VideoRateAbbr
video_rate_abbrs
[]
=
{
...
...
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