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
4888932c
Commit
4888932c
authored
Jun 09, 2016
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat: Fix max value of AV_OPT_TYPE_VIDEO_RATE
Signed-off-by:
Michael Niedermayer
<
michael@niedermayer.cc
>
parent
f2c8b666
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
6 deletions
+6
-6
bintext.c
libavformat/bintext.c
+1
-1
img2dec.c
libavformat/img2dec.c
+1
-1
rawdec.c
libavformat/rawdec.c
+1
-1
rawvideodec.c
libavformat/rawvideodec.c
+1
-1
tty.c
libavformat/tty.c
+1
-1
v210.c
libavformat/v210.c
+1
-1
No files found.
libavformat/bintext.c
View file @
4888932c
...
@@ -326,7 +326,7 @@ static int read_packet(AVFormatContext *s,
...
@@ -326,7 +326,7 @@ static int read_packet(AVFormatContext *s,
static
const
AVOption
options
[]
=
{
static
const
AVOption
options
[]
=
{
{
"linespeed"
,
"set simulated line speed (bytes per second)"
,
OFFSET
(
chars_per_frame
),
AV_OPT_TYPE_INT
,
{.
i64
=
6000
},
1
,
INT_MAX
,
AV_OPT_FLAG_DECODING_PARAM
},
{
"linespeed"
,
"set simulated line speed (bytes per second)"
,
OFFSET
(
chars_per_frame
),
AV_OPT_TYPE_INT
,
{.
i64
=
6000
},
1
,
INT_MAX
,
AV_OPT_FLAG_DECODING_PARAM
},
{
"video_size"
,
"set video size, such as 640x480 or hd720."
,
OFFSET
(
width
),
AV_OPT_TYPE_IMAGE_SIZE
,
{.
str
=
NULL
},
0
,
0
,
AV_OPT_FLAG_DECODING_PARAM
},
{
"video_size"
,
"set video size, such as 640x480 or hd720."
,
OFFSET
(
width
),
AV_OPT_TYPE_IMAGE_SIZE
,
{.
str
=
NULL
},
0
,
0
,
AV_OPT_FLAG_DECODING_PARAM
},
{
"framerate"
,
"set framerate (frames per second)"
,
OFFSET
(
framerate
),
AV_OPT_TYPE_VIDEO_RATE
,
{.
str
=
"25"
},
0
,
0
,
AV_OPT_FLAG_DECODING_PARAM
},
{
"framerate"
,
"set framerate (frames per second)"
,
OFFSET
(
framerate
),
AV_OPT_TYPE_VIDEO_RATE
,
{.
str
=
"25"
},
0
,
INT_MAX
,
AV_OPT_FLAG_DECODING_PARAM
},
{
NULL
},
{
NULL
},
};
};
...
...
libavformat/img2dec.c
View file @
4888932c
...
@@ -561,7 +561,7 @@ static int img_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
...
@@ -561,7 +561,7 @@ static int img_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
#define OFFSET(x) offsetof(VideoDemuxData, x)
#define OFFSET(x) offsetof(VideoDemuxData, x)
#define DEC AV_OPT_FLAG_DECODING_PARAM
#define DEC AV_OPT_FLAG_DECODING_PARAM
const
AVOption
ff_img_options
[]
=
{
const
AVOption
ff_img_options
[]
=
{
{
"framerate"
,
"set the video framerate"
,
OFFSET
(
framerate
),
AV_OPT_TYPE_VIDEO_RATE
,
{.
str
=
"25"
},
0
,
0
,
DEC
},
{
"framerate"
,
"set the video framerate"
,
OFFSET
(
framerate
),
AV_OPT_TYPE_VIDEO_RATE
,
{.
str
=
"25"
},
0
,
INT_MAX
,
DEC
},
{
"loop"
,
"force loop over input file sequence"
,
OFFSET
(
loop
),
AV_OPT_TYPE_BOOL
,
{.
i64
=
0
},
0
,
1
,
DEC
},
{
"loop"
,
"force loop over input file sequence"
,
OFFSET
(
loop
),
AV_OPT_TYPE_BOOL
,
{.
i64
=
0
},
0
,
1
,
DEC
},
{
"pattern_type"
,
"set pattern type"
,
OFFSET
(
pattern_type
),
AV_OPT_TYPE_INT
,
{.
i64
=
PT_DEFAULT
},
0
,
INT_MAX
,
DEC
,
"pattern_type"
},
{
"pattern_type"
,
"set pattern type"
,
OFFSET
(
pattern_type
),
AV_OPT_TYPE_INT
,
{.
i64
=
PT_DEFAULT
},
0
,
INT_MAX
,
DEC
,
"pattern_type"
},
...
...
libavformat/rawdec.c
View file @
4888932c
...
@@ -107,7 +107,7 @@ int ff_raw_data_read_header(AVFormatContext *s)
...
@@ -107,7 +107,7 @@ int ff_raw_data_read_header(AVFormatContext *s)
#define OFFSET(x) offsetof(FFRawVideoDemuxerContext, x)
#define OFFSET(x) offsetof(FFRawVideoDemuxerContext, x)
#define DEC AV_OPT_FLAG_DECODING_PARAM
#define DEC AV_OPT_FLAG_DECODING_PARAM
const
AVOption
ff_rawvideo_options
[]
=
{
const
AVOption
ff_rawvideo_options
[]
=
{
{
"framerate"
,
""
,
OFFSET
(
framerate
),
AV_OPT_TYPE_VIDEO_RATE
,
{.
str
=
"25"
},
0
,
0
,
DEC
},
{
"framerate"
,
""
,
OFFSET
(
framerate
),
AV_OPT_TYPE_VIDEO_RATE
,
{.
str
=
"25"
},
0
,
INT_MAX
,
DEC
},
{
NULL
},
{
NULL
},
};
};
...
...
libavformat/rawvideodec.c
View file @
4888932c
...
@@ -89,7 +89,7 @@ static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt)
...
@@ -89,7 +89,7 @@ static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt)
static
const
AVOption
rawvideo_options
[]
=
{
static
const
AVOption
rawvideo_options
[]
=
{
{
"video_size"
,
"set frame size"
,
OFFSET
(
width
),
AV_OPT_TYPE_IMAGE_SIZE
,
{.
str
=
NULL
},
0
,
0
,
DEC
},
{
"video_size"
,
"set frame size"
,
OFFSET
(
width
),
AV_OPT_TYPE_IMAGE_SIZE
,
{.
str
=
NULL
},
0
,
0
,
DEC
},
{
"pixel_format"
,
"set pixel format"
,
OFFSET
(
pixel_format
),
AV_OPT_TYPE_STRING
,
{.
str
=
"yuv420p"
},
0
,
0
,
DEC
},
{
"pixel_format"
,
"set pixel format"
,
OFFSET
(
pixel_format
),
AV_OPT_TYPE_STRING
,
{.
str
=
"yuv420p"
},
0
,
0
,
DEC
},
{
"framerate"
,
"set frame rate"
,
OFFSET
(
framerate
),
AV_OPT_TYPE_VIDEO_RATE
,
{.
str
=
"25"
},
0
,
0
,
DEC
},
{
"framerate"
,
"set frame rate"
,
OFFSET
(
framerate
),
AV_OPT_TYPE_VIDEO_RATE
,
{.
str
=
"25"
},
0
,
INT_MAX
,
DEC
},
{
NULL
},
{
NULL
},
};
};
...
...
libavformat/tty.c
View file @
4888932c
...
@@ -138,7 +138,7 @@ static int read_packet(AVFormatContext *avctx, AVPacket *pkt)
...
@@ -138,7 +138,7 @@ static int read_packet(AVFormatContext *avctx, AVPacket *pkt)
static
const
AVOption
options
[]
=
{
static
const
AVOption
options
[]
=
{
{
"chars_per_frame"
,
""
,
offsetof
(
TtyDemuxContext
,
chars_per_frame
),
AV_OPT_TYPE_INT
,
{.
i64
=
6000
},
1
,
INT_MAX
,
AV_OPT_FLAG_DECODING_PARAM
},
{
"chars_per_frame"
,
""
,
offsetof
(
TtyDemuxContext
,
chars_per_frame
),
AV_OPT_TYPE_INT
,
{.
i64
=
6000
},
1
,
INT_MAX
,
AV_OPT_FLAG_DECODING_PARAM
},
{
"video_size"
,
"A string describing frame size, such as 640x480 or hd720."
,
OFFSET
(
width
),
AV_OPT_TYPE_IMAGE_SIZE
,
{.
str
=
NULL
},
0
,
0
,
DEC
},
{
"video_size"
,
"A string describing frame size, such as 640x480 or hd720."
,
OFFSET
(
width
),
AV_OPT_TYPE_IMAGE_SIZE
,
{.
str
=
NULL
},
0
,
0
,
DEC
},
{
"framerate"
,
""
,
OFFSET
(
framerate
),
AV_OPT_TYPE_VIDEO_RATE
,
{.
str
=
"25"
},
0
,
0
,
DEC
},
{
"framerate"
,
""
,
OFFSET
(
framerate
),
AV_OPT_TYPE_VIDEO_RATE
,
{.
str
=
"25"
},
0
,
INT_MAX
,
DEC
},
{
NULL
},
{
NULL
},
};
};
...
...
libavformat/v210.c
View file @
4888932c
...
@@ -83,7 +83,7 @@ static int v210_read_packet(AVFormatContext *s, AVPacket *pkt)
...
@@ -83,7 +83,7 @@ static int v210_read_packet(AVFormatContext *s, AVPacket *pkt)
#define DEC AV_OPT_FLAG_DECODING_PARAM
#define DEC AV_OPT_FLAG_DECODING_PARAM
static
const
AVOption
v210_options
[]
=
{
static
const
AVOption
v210_options
[]
=
{
{
"video_size"
,
"set frame size"
,
OFFSET
(
width
),
AV_OPT_TYPE_IMAGE_SIZE
,
{.
str
=
NULL
},
0
,
0
,
DEC
},
{
"video_size"
,
"set frame size"
,
OFFSET
(
width
),
AV_OPT_TYPE_IMAGE_SIZE
,
{.
str
=
NULL
},
0
,
0
,
DEC
},
{
"framerate"
,
"set frame rate"
,
OFFSET
(
framerate
),
AV_OPT_TYPE_VIDEO_RATE
,
{.
str
=
"25"
},
0
,
0
,
DEC
},
{
"framerate"
,
"set frame rate"
,
OFFSET
(
framerate
),
AV_OPT_TYPE_VIDEO_RATE
,
{.
str
=
"25"
},
0
,
INT_MAX
,
DEC
},
{
NULL
},
{
NULL
},
};
};
...
...
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