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
55ba12e3
Commit
55ba12e3
authored
Jun 15, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: deprecate -vc and -tvstd
They've been replaced by demuxer private options.
parent
8035f429
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
10 deletions
+6
-10
ffmpeg.c
ffmpeg.c
+6
-10
No files found.
ffmpeg.c
View file @
55ba12e3
...
...
@@ -213,9 +213,6 @@ static int copy_initial_nonkeyframes = 0;
static
int
rate_emu
=
0
;
static
int
video_channel
=
0
;
static
char
*
video_standard
;
static
int
audio_volume
=
256
;
static
int
exit_on_error
=
0
;
...
...
@@ -493,8 +490,6 @@ static int ffmpeg_exit(int ret)
av_free
(
subtitle_codec_name
);
av_free
(
data_codec_name
);
av_free
(
video_standard
);
uninit_opts
();
av_free
(
audio_buf
);
av_free
(
audio_out
);
...
...
@@ -2922,13 +2917,15 @@ static int opt_audio_channels(const char *opt, const char *arg)
static
int
opt_video_channel
(
const
char
*
opt
,
const
char
*
arg
)
{
video_channel
=
parse_number_or_die
(
opt
,
arg
,
OPT_INT64
,
0
,
INT_MAX
);
av_log
(
NULL
,
AV_LOG_WARNING
,
"This option is deprecated, use -channel.
\n
"
);
opt_default
(
"channel"
,
arg
);
return
0
;
}
static
int
opt_video_standard
(
const
char
*
opt
,
const
char
*
arg
)
{
video_standard
=
av_strdup
(
arg
);
av_log
(
NULL
,
AV_LOG_WARNING
,
"This option is deprecated, use -standard.
\n
"
);
opt_default
(
"standard"
,
arg
);
return
0
;
}
...
...
@@ -3366,7 +3363,6 @@ static int opt_input_file(const char *opt, const char *filename)
input_files
[
nb_input_files
-
1
].
ctx
=
ic
;
input_files
[
nb_input_files
-
1
].
ist_index
=
nb_input_streams
-
ic
->
nb_streams
;
video_channel
=
0
;
frame_rate
=
(
AVRational
){
0
,
0
};
frame_pix_fmt
=
PIX_FMT_NONE
;
frame_height
=
0
;
...
...
@@ -4397,8 +4393,8 @@ static const OptionDef options[] = {
{
"stag"
,
HAS_ARG
|
OPT_EXPERT
|
OPT_SUBTITLE
,
{(
void
*
)
opt_codec_tag
},
"force subtitle tag/fourcc"
,
"fourcc/tag"
},
/* grab options */
{
"vc"
,
HAS_ARG
|
OPT_EXPERT
|
OPT_VIDEO
|
OPT_GRAB
,
{(
void
*
)
opt_video_channel
},
"
set video grab channel (DV1394 only)
"
,
"channel"
},
{
"tvstd"
,
HAS_ARG
|
OPT_EXPERT
|
OPT_VIDEO
|
OPT_GRAB
,
{(
void
*
)
opt_video_standard
},
"
set television standard (NTSC, PAL (SECAM))
"
,
"standard"
},
{
"vc"
,
HAS_ARG
|
OPT_EXPERT
|
OPT_VIDEO
|
OPT_GRAB
,
{(
void
*
)
opt_video_channel
},
"
deprecated, use -channel
"
,
"channel"
},
{
"tvstd"
,
HAS_ARG
|
OPT_EXPERT
|
OPT_VIDEO
|
OPT_GRAB
,
{(
void
*
)
opt_video_standard
},
"
deprecated, use -standard
"
,
"standard"
},
{
"isync"
,
OPT_BOOL
|
OPT_EXPERT
|
OPT_GRAB
,
{(
void
*
)
&
input_sync
},
"sync read on input"
,
""
},
/* muxer options */
...
...
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