Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
51aeb694
Commit
51aeb694
authored
Nov 21, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avconv: remove an always true condition and reindent.
parent
7204ec1a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
21 deletions
+19
-21
avconv.c
avconv.c
+19
-21
No files found.
avconv.c
View file @
51aeb694
...
...
@@ -1856,29 +1856,27 @@ static int output_packet(InputStream *ist, int ist_index,
/* set the input output pts pairs */
//ost->sync_ipts = (double)(ist->pts + input_files[ist->file_index].ts_offset - start_time)/ AV_TIME_BASE;
if
(
ost
->
encoding_needed
)
{
av_assert0
(
ist
->
decoding_needed
);
switch
(
ost
->
st
->
codec
->
codec_type
)
{
case
AVMEDIA_TYPE_AUDIO
:
do_audio_out
(
os
,
ost
,
ist
,
decoded_data_buf
,
decoded_data_size
);
break
;
case
AVMEDIA_TYPE_VIDEO
:
av_assert0
(
ist
->
decoding_needed
);
switch
(
ost
->
st
->
codec
->
codec_type
)
{
case
AVMEDIA_TYPE_AUDIO
:
do_audio_out
(
os
,
ost
,
ist
,
decoded_data_buf
,
decoded_data_size
);
break
;
case
AVMEDIA_TYPE_VIDEO
:
#if CONFIG_AVFILTER
if
(
ost
->
picref
->
video
&&
!
ost
->
frame_aspect_ratio
)
ost
->
st
->
codec
->
sample_aspect_ratio
=
ost
->
picref
->
video
->
pixel_aspect
;
if
(
ost
->
picref
->
video
&&
!
ost
->
frame_aspect_ratio
)
ost
->
st
->
codec
->
sample_aspect_ratio
=
ost
->
picref
->
video
->
pixel_aspect
;
#endif
do_video_out
(
os
,
ost
,
ist
,
filtered_frame
,
&
frame_size
,
same_quant
?
quality
:
ost
->
st
->
codec
->
global_quality
);
if
(
vstats_filename
&&
frame_size
)
do_video_stats
(
os
,
ost
,
frame_size
);
break
;
case
AVMEDIA_TYPE_SUBTITLE
:
do_subtitle_out
(
os
,
ost
,
ist
,
&
subtitle
,
pkt
->
pts
);
break
;
default
:
abort
();
}
do_video_out
(
os
,
ost
,
ist
,
filtered_frame
,
&
frame_size
,
same_quant
?
quality
:
ost
->
st
->
codec
->
global_quality
);
if
(
vstats_filename
&&
frame_size
)
do_video_stats
(
os
,
ost
,
frame_size
);
break
;
case
AVMEDIA_TYPE_SUBTITLE
:
do_subtitle_out
(
os
,
ost
,
ist
,
&
subtitle
,
pkt
->
pts
);
break
;
default
:
abort
();
}
#if CONFIG_AVFILTER
frame_available
=
(
ist
->
st
->
codec
->
codec_type
==
AVMEDIA_TYPE_VIDEO
)
&&
...
...
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