Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
f3eec1cf
Commit
f3eec1cf
authored
16 years ago
by
Michael Niedermayer
Browse files
Options
Downloads
Patches
Plain Diff
Fix closed gop flag disapearence.
Originally committed as revision 12625 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
5202ed31
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libavcodec/avcodec.h
+1
-1
1 addition, 1 deletion
libavcodec/avcodec.h
libavcodec/utils.c
+2
-2
2 additions, 2 deletions
libavcodec/utils.c
with
3 additions
and
3 deletions
libavcodec/avcodec.h
+
1
−
1
View file @
f3eec1cf
...
...
@@ -432,7 +432,7 @@ typedef struct RcOverride{
#define CODEC_FLAG_H263P_SLICE_STRUCT 0x10000000
#define CODEC_FLAG_INTERLACED_ME 0x20000000 ///< interlaced motion estimation
#define CODEC_FLAG_SVCD_SCAN_OFFSET 0x40000000 ///< Will reserve space for SVCD scan offset user data.
#define CODEC_FLAG_CLOSED_GOP
((int)
0x80000000
)
#define CODEC_FLAG_CLOSED_GOP 0x80000000
#define CODEC_FLAG2_FAST 0x00000001 ///< Allow non spec compliant speedup tricks.
#define CODEC_FLAG2_STRICT_GOP 0x00000002 ///< Strictly enforce GOP size.
#define CODEC_FLAG2_NO_OUTPUT 0x00000004 ///< Skip bitstream encoding.
...
...
This diff is collapsed.
Click to expand it.
libavcodec/utils.c
+
2
−
2
View file @
f3eec1cf
...
...
@@ -433,7 +433,7 @@ static const AVOption options[]={
{
"b"
,
"set bitrate (in bits/s)"
,
OFFSET
(
bit_rate
),
FF_OPT_TYPE_INT
,
AV_CODEC_DEFAULT_BITRATE
,
INT_MIN
,
INT_MAX
,
V
|
E
},
{
"ab"
,
"set bitrate (in bits/s)"
,
OFFSET
(
bit_rate
),
FF_OPT_TYPE_INT
,
64
*
1000
,
INT_MIN
,
INT_MAX
,
A
|
E
},
{
"bt"
,
"set video bitrate tolerance (in bits/s)"
,
OFFSET
(
bit_rate_tolerance
),
FF_OPT_TYPE_INT
,
AV_CODEC_DEFAULT_BITRATE
*
20
,
1
,
INT_MAX
,
V
|
E
},
{
"flags"
,
NULL
,
OFFSET
(
flags
),
FF_OPT_TYPE_FLAGS
,
DEFAULT
,
INT_MIN
,
INT_MAX
,
V
|
A
|
E
|
D
,
"flags"
},
{
"flags"
,
NULL
,
OFFSET
(
flags
),
FF_OPT_TYPE_FLAGS
,
DEFAULT
,
0
,
U
INT_MAX
,
V
|
A
|
E
|
D
,
"flags"
},
{
"mv4"
,
"use four motion vector by macroblock (mpeg4)"
,
0
,
FF_OPT_TYPE_CONST
,
CODEC_FLAG_4MV
,
INT_MIN
,
INT_MAX
,
V
|
E
,
"flags"
},
{
"obmc"
,
"use overlapped block motion compensation (h263+)"
,
0
,
FF_OPT_TYPE_CONST
,
CODEC_FLAG_OBMC
,
INT_MIN
,
INT_MAX
,
V
|
E
,
"flags"
},
{
"qpel"
,
"use 1/4 pel motion compensation"
,
0
,
FF_OPT_TYPE_CONST
,
CODEC_FLAG_QPEL
,
INT_MIN
,
INT_MAX
,
V
|
E
,
"flags"
},
...
...
@@ -685,7 +685,7 @@ static const AVOption options[]={
{
"nr"
,
"noise reduction"
,
OFFSET
(
noise_reduction
),
FF_OPT_TYPE_INT
,
DEFAULT
,
INT_MIN
,
INT_MAX
,
V
|
E
},
{
"rc_init_occupancy"
,
"number of bits which should be loaded into the rc buffer before decoding starts"
,
OFFSET
(
rc_initial_buffer_occupancy
),
FF_OPT_TYPE_INT
,
DEFAULT
,
INT_MIN
,
INT_MAX
,
V
|
E
},
{
"inter_threshold"
,
NULL
,
OFFSET
(
inter_threshold
),
FF_OPT_TYPE_INT
,
DEFAULT
,
INT_MIN
,
INT_MAX
,
V
|
E
},
{
"flags2"
,
NULL
,
OFFSET
(
flags2
),
FF_OPT_TYPE_FLAGS
,
CODEC_FLAG2_FASTPSKIP
|
CODEC_FLAG2_BIT_RESERVOIR
,
INT_MIN
,
INT_MAX
,
V
|
A
|
E
|
D
,
"flags2"
},
{
"flags2"
,
NULL
,
OFFSET
(
flags2
),
FF_OPT_TYPE_FLAGS
,
CODEC_FLAG2_FASTPSKIP
|
CODEC_FLAG2_BIT_RESERVOIR
,
0
,
U
INT_MAX
,
V
|
A
|
E
|
D
,
"flags2"
},
{
"error"
,
NULL
,
OFFSET
(
error_rate
),
FF_OPT_TYPE_INT
,
DEFAULT
,
INT_MIN
,
INT_MAX
,
V
|
E
},
{
"antialias"
,
"MP3 antialias algorithm"
,
OFFSET
(
antialias_algo
),
FF_OPT_TYPE_INT
,
DEFAULT
,
INT_MIN
,
INT_MAX
,
V
|
D
,
"aa"
},
{
"auto"
,
NULL
,
0
,
FF_OPT_TYPE_CONST
,
FF_AA_AUTO
,
INT_MIN
,
INT_MAX
,
V
|
D
,
"aa"
},
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment