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
0b7ccad6
Commit
0b7ccad6
authored
Jun 15, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: don't abuse a global for passing frame size from input to output
It's broken with multiple files or video streams.
parent
10de86b8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
ffmpeg.c
ffmpeg.c
+10
-6
No files found.
ffmpeg.c
View file @
0b7ccad6
...
@@ -2226,6 +2226,10 @@ static int transcode(AVFormatContext **output_files,
...
@@ -2226,6 +2226,10 @@ static int transcode(AVFormatContext **output_files,
#endif
#endif
codec
->
bits_per_raw_sample
=
0
;
codec
->
bits_per_raw_sample
=
0
;
}
}
if
(
!
codec
->
width
||
!
codec
->
height
)
{
codec
->
width
=
icodec
->
width
;
codec
->
height
=
icodec
->
height
;
}
ost
->
resample_height
=
icodec
->
height
;
ost
->
resample_height
=
icodec
->
height
;
ost
->
resample_width
=
icodec
->
width
;
ost
->
resample_width
=
icodec
->
width
;
ost
->
resample_pix_fmt
=
icodec
->
pix_fmt
;
ost
->
resample_pix_fmt
=
icodec
->
pix_fmt
;
...
@@ -3297,16 +3301,12 @@ static int opt_input_file(const char *opt, const char *filename)
...
@@ -3297,16 +3301,12 @@ static int opt_input_file(const char *opt, const char *filename)
case
AVMEDIA_TYPE_VIDEO
:
case
AVMEDIA_TYPE_VIDEO
:
input_codecs
[
nb_input_codecs
-
1
]
=
avcodec_find_decoder_by_name
(
video_codec_name
);
input_codecs
[
nb_input_codecs
-
1
]
=
avcodec_find_decoder_by_name
(
video_codec_name
);
set_context_opts
(
dec
,
avcodec_opts
[
AVMEDIA_TYPE_VIDEO
],
AV_OPT_FLAG_VIDEO_PARAM
|
AV_OPT_FLAG_DECODING_PARAM
,
input_codecs
[
nb_input_codecs
-
1
]);
set_context_opts
(
dec
,
avcodec_opts
[
AVMEDIA_TYPE_VIDEO
],
AV_OPT_FLAG_VIDEO_PARAM
|
AV_OPT_FLAG_DECODING_PARAM
,
input_codecs
[
nb_input_codecs
-
1
]);
frame_height
=
dec
->
height
;
frame_width
=
dec
->
width
;
rfps
=
ic
->
streams
[
i
]
->
r_frame_rate
.
num
;
rfps
=
ic
->
streams
[
i
]
->
r_frame_rate
.
num
;
rfps_base
=
ic
->
streams
[
i
]
->
r_frame_rate
.
den
;
rfps_base
=
ic
->
streams
[
i
]
->
r_frame_rate
.
den
;
if
(
dec
->
lowres
)
{
if
(
dec
->
lowres
)
{
dec
->
flags
|=
CODEC_FLAG_EMU_EDGE
;
dec
->
flags
|=
CODEC_FLAG_EMU_EDGE
;
frame_height
>>=
dec
->
lowres
;
dec
->
height
>>=
dec
->
lowres
;
frame_width
>>=
dec
->
lowres
;
dec
->
width
>>=
dec
->
lowres
;
dec
->
height
=
frame_height
;
dec
->
width
=
frame_width
;
}
}
if
(
me_threshold
)
if
(
me_threshold
)
dec
->
debug
|=
FF_DEBUG_MV
;
dec
->
debug
|=
FF_DEBUG_MV
;
...
@@ -3352,6 +3352,8 @@ static int opt_input_file(const char *opt, const char *filename)
...
@@ -3352,6 +3352,8 @@ static int opt_input_file(const char *opt, const char *filename)
video_channel
=
0
;
video_channel
=
0
;
frame_rate
=
(
AVRational
){
0
,
0
};
frame_rate
=
(
AVRational
){
0
,
0
};
frame_pix_fmt
=
PIX_FMT_NONE
;
frame_pix_fmt
=
PIX_FMT_NONE
;
frame_height
=
0
;
frame_width
=
0
;
audio_sample_rate
=
0
;
audio_sample_rate
=
0
;
audio_channels
=
0
;
audio_channels
=
0
;
...
@@ -3893,6 +3895,8 @@ static void opt_output_file(const char *filename)
...
@@ -3893,6 +3895,8 @@ static void opt_output_file(const char *filename)
set_context_opts
(
oc
,
avformat_opts
,
AV_OPT_FLAG_ENCODING_PARAM
,
NULL
);
set_context_opts
(
oc
,
avformat_opts
,
AV_OPT_FLAG_ENCODING_PARAM
,
NULL
);
frame_rate
=
(
AVRational
){
0
,
0
};
frame_rate
=
(
AVRational
){
0
,
0
};
frame_width
=
0
;
frame_height
=
0
;
audio_sample_rate
=
0
;
audio_sample_rate
=
0
;
audio_channels
=
0
;
audio_channels
=
0
;
...
...
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