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
059fb8c8
Commit
059fb8c8
authored
Nov 06, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avconv: remove some redundant temporary variables.
parent
f8c314c8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
11 deletions
+8
-11
avconv.c
avconv.c
+8
-11
No files found.
avconv.c
View file @
059fb8c8
...
@@ -2794,7 +2794,6 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
...
@@ -2794,7 +2794,6 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
AVStream
*
st
=
ic
->
streams
[
i
];
AVStream
*
st
=
ic
->
streams
[
i
];
AVCodecContext
*
dec
=
st
->
codec
;
AVCodecContext
*
dec
=
st
->
codec
;
InputStream
*
ist
;
InputStream
*
ist
;
double
scale
=
1
.
0
;
input_streams
=
grow_array
(
input_streams
,
sizeof
(
*
input_streams
),
&
nb_input_streams
,
nb_input_streams
+
1
);
input_streams
=
grow_array
(
input_streams
,
sizeof
(
*
input_streams
),
&
nb_input_streams
,
nb_input_streams
+
1
);
ist
=
&
input_streams
[
nb_input_streams
-
1
];
ist
=
&
input_streams
[
nb_input_streams
-
1
];
...
@@ -2803,8 +2802,8 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
...
@@ -2803,8 +2802,8 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
ist
->
discard
=
1
;
ist
->
discard
=
1
;
ist
->
opts
=
filter_codec_opts
(
codec_opts
,
ist
->
st
->
codec
->
codec_id
,
ic
,
st
);
ist
->
opts
=
filter_codec_opts
(
codec_opts
,
ist
->
st
->
codec
->
codec_id
,
ic
,
st
);
MATCH_PER_STREAM_OPT
(
ts_scale
,
dbl
,
scale
,
ic
,
st
)
;
ist
->
ts_scale
=
1
.
0
;
ist
->
ts_scale
=
scale
;
MATCH_PER_STREAM_OPT
(
ts_scale
,
dbl
,
ist
->
ts_scale
,
ic
,
st
)
;
ist
->
dec
=
choose_decoder
(
o
,
ic
,
st
);
ist
->
dec
=
choose_decoder
(
o
,
ic
,
st
);
...
@@ -3112,7 +3111,6 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
...
@@ -3112,7 +3111,6 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
OutputStream
*
ost
;
OutputStream
*
ost
;
AVStream
*
st
=
avformat_new_stream
(
oc
,
NULL
);
AVStream
*
st
=
avformat_new_stream
(
oc
,
NULL
);
int
idx
=
oc
->
nb_streams
-
1
,
ret
=
0
;
int
idx
=
oc
->
nb_streams
-
1
,
ret
=
0
;
int64_t
max_frames
=
INT64_MAX
;
char
*
bsf
=
NULL
,
*
next
,
*
codec_tag
=
NULL
;
char
*
bsf
=
NULL
,
*
next
,
*
codec_tag
=
NULL
;
AVBitStreamFilterContext
*
bsfc
,
*
bsfc_prev
=
NULL
;
AVBitStreamFilterContext
*
bsfc
,
*
bsfc_prev
=
NULL
;
double
qscale
=
-
1
;
double
qscale
=
-
1
;
...
@@ -3167,8 +3165,8 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
...
@@ -3167,8 +3165,8 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
exit_program
(
1
);
exit_program
(
1
);
}
}
MATCH_PER_STREAM_OPT
(
max_frames
,
i64
,
max_frames
,
oc
,
st
)
;
ost
->
max_frames
=
INT64_MAX
;
ost
->
max_frames
=
max_frames
;
MATCH_PER_STREAM_OPT
(
max_frames
,
i64
,
ost
->
max_frames
,
oc
,
st
)
;
MATCH_PER_STREAM_OPT
(
bitstream_filters
,
str
,
bsf
,
oc
,
st
);
MATCH_PER_STREAM_OPT
(
bitstream_filters
,
str
,
bsf
,
oc
,
st
);
while
(
bsf
)
{
while
(
bsf
)
{
...
@@ -3240,7 +3238,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
...
@@ -3240,7 +3238,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
char
*
forced_key_frames
=
NULL
,
*
frame_rate
=
NULL
,
*
frame_size
=
NULL
;
char
*
forced_key_frames
=
NULL
,
*
frame_rate
=
NULL
,
*
frame_size
=
NULL
;
char
*
frame_aspect_ratio
=
NULL
,
*
frame_pix_fmt
=
NULL
;
char
*
frame_aspect_ratio
=
NULL
,
*
frame_pix_fmt
=
NULL
;
char
*
intra_matrix
=
NULL
,
*
inter_matrix
=
NULL
,
*
filters
=
NULL
;
char
*
intra_matrix
=
NULL
,
*
inter_matrix
=
NULL
,
*
filters
=
NULL
;
int
i
,
force_fps
=
0
,
top_field_first
=
-
1
;
int
i
;
MATCH_PER_STREAM_OPT
(
frame_rates
,
str
,
frame_rate
,
oc
,
st
);
MATCH_PER_STREAM_OPT
(
frame_rates
,
str
,
frame_rate
,
oc
,
st
);
if
(
frame_rate
&&
av_parse_video_rate
(
&
ost
->
frame_rate
,
frame_rate
)
<
0
)
{
if
(
frame_rate
&&
av_parse_video_rate
(
&
ost
->
frame_rate
,
frame_rate
)
<
0
)
{
...
@@ -3324,11 +3322,10 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
...
@@ -3324,11 +3322,10 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
if
(
forced_key_frames
)
if
(
forced_key_frames
)
parse_forced_key_frames
(
forced_key_frames
,
ost
,
video_enc
);
parse_forced_key_frames
(
forced_key_frames
,
ost
,
video_enc
);
MATCH_PER_STREAM_OPT
(
force_fps
,
i
,
force_fps
,
oc
,
st
);
MATCH_PER_STREAM_OPT
(
force_fps
,
i
,
ost
->
force_fps
,
oc
,
st
);
ost
->
force_fps
=
force_fps
;
MATCH_PER_STREAM_OPT
(
top_field_first
,
i
,
top_field_first
,
oc
,
st
)
;
ost
->
top_field_first
=
-
1
;
ost
->
top_field_first
=
top_field_first
;
MATCH_PER_STREAM_OPT
(
top_field_first
,
i
,
ost
->
top_field_first
,
oc
,
st
)
;
MATCH_PER_STREAM_OPT
(
copy_initial_nonkeyframes
,
i
,
ost
->
copy_initial_nonkeyframes
,
oc
,
st
);
MATCH_PER_STREAM_OPT
(
copy_initial_nonkeyframes
,
i
,
ost
->
copy_initial_nonkeyframes
,
oc
,
st
);
...
...
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