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
219b39a7
Commit
219b39a7
authored
Jul 20, 2015
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
parseutil: Use non ambiguous aliases for uhd
uhd1 and uhd2 would be ambigous.
parent
9ed6f9a1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
avconv.texi
doc/avconv.texi
+2
-2
parseutils.c
libavutil/parseutils.c
+2
-2
No files found.
doc/avconv.texi
View file @
219b39a7
...
...
@@ -497,9 +497,9 @@ abbreviations are recognized:
2048x1080
@item 4kdci
4096x2160
@item uhd
1
@item uhd
2160
3840x2160
@item uhd
2
@item uhd
4320
7680x4320
@end table
...
...
libavutil/parseutils.c
View file @
219b39a7
...
...
@@ -82,8 +82,8 @@ static const VideoSizeAbbr video_size_abbrs[] = {
{
"hd1080"
,
1920
,
1080
},
{
"2kdci"
,
2048
,
1080
},
{
"4kdci"
,
4096
,
2160
},
{
"uhd
1"
,
3840
,
2160
},
{
"uhd
2"
,
7680
,
4320
},
{
"uhd
2160"
,
3840
,
2160
},
{
"uhd
4320"
,
7680
,
4320
},
};
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