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
71956371
Commit
71956371
authored
Feb 03, 2013
by
Dave Rice
Committed by
Stefano Sabatini
Feb 03, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavu/parseutils: add digital cinema frame sizes
Signed-off-by:
Stefano Sabatini
<
stefasab@gmail.com
>
parent
d106679f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
1 deletion
+19
-1
syntax.texi
doc/syntax.texi
+12
-0
parseutils.c
libavutil/parseutils.c
+6
-0
version.h
libavutil/version.h
+1
-1
No files found.
doc/syntax.texi
View file @
71956371
...
...
@@ -186,6 +186,18 @@ The following abbreviations are recognized:
1280x720
@item hd1080
1920x1080
@item 2k
2048x1080
@item 2kflat
1998x1080
@item 2kscope
2048x858
@item 4k
4096x2160
@item 4kflat
3996x2160
@item 4kscope
4096x1716
@end table
@anchor{video rate syntax}
...
...
libavutil/parseutils.c
View file @
71956371
...
...
@@ -109,6 +109,12 @@ static const VideoSizeAbbr video_size_abbrs[] = {
{
"hd480"
,
852
,
480
},
{
"hd720"
,
1280
,
720
},
{
"hd1080"
,
1920
,
1080
},
{
"2k"
,
2048
,
1080
},
/* Digital Cinema System Specification */
{
"2kflat"
,
1998
,
1080
},
{
"2kscope"
,
2048
,
858
},
{
"4k"
,
4096
,
2160
},
/* Digital Cinema System Specification */
{
"4kflat"
,
3996
,
2160
},
{
"4kscope"
,
4096
,
1716
},
};
static
const
VideoRateAbbr
video_rate_abbrs
[]
=
{
...
...
libavutil/version.h
View file @
71956371
...
...
@@ -76,7 +76,7 @@
#define LIBAVUTIL_VERSION_MAJOR 52
#define LIBAVUTIL_VERSION_MINOR 17
#define LIBAVUTIL_VERSION_MICRO 10
0
#define LIBAVUTIL_VERSION_MICRO 10
1
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \
...
...
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