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
a7844c58
Commit
a7844c58
authored
Mar 16, 2011
by
Thierry Foucu
Committed by
Michael Niedermayer
Mar 17, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation error when CONFIG_AVFILTER is not defined.
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
6f1260f8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
ffmpeg.c
ffmpeg.c
+7
-2
No files found.
ffmpeg.c
View file @
a7844c58
...
...
@@ -1698,7 +1698,11 @@ static int output_packet(AVInputStream *ist, int ist_index,
av_init_packet
(
&
opkt
);
if
((
!
ost
->
frame_number
&&
!
(
pkt
->
flags
&
AV_PKT_FLAG_KEY
))
&&
!
copy_initial_nonkeyframes
)
#if !CONFIG_AVFILTER
continue
;
#else
goto
cont
;
#endif
/* no reencoding needed : output the packet directly */
/* force the input stream PTS */
...
...
@@ -1746,8 +1750,8 @@ static int output_packet(AVInputStream *ist, int ist_index,
ost
->
frame_number
++
;
av_free_packet
(
&
opkt
);
}
cont
:
#if CONFIG_AVFILTER
cont
:
frame_available
=
(
ist
->
st
->
codec
->
codec_type
==
AVMEDIA_TYPE_VIDEO
)
&&
ost
->
output_video_filter
&&
avfilter_poll_frame
(
ost
->
output_video_filter
->
inputs
[
0
]);
if
(
ost
->
picref
)
...
...
@@ -3402,7 +3406,7 @@ static void new_video_stream(AVFormatContext *oc, int file_idx)
codec_id
=
av_guess_codec
(
oc
->
oformat
,
NULL
,
oc
->
filename
,
NULL
,
AVMEDIA_TYPE_VIDEO
);
codec
=
avcodec_find_encoder
(
codec_id
);
}
#if CONFIG_AVFILTER
if
(
frame_aspect_ratio
>
0
){
i
=
vfilters
?
strlen
(
vfilters
)
:
0
;
vfilters
=
av_realloc
(
vfilters
,
i
+
100
);
...
...
@@ -3412,6 +3416,7 @@ static void new_video_stream(AVFormatContext *oc, int file_idx)
ost
->
avfilter
=
vfilters
;
vfilters
=
NULL
;
#endif
}
avcodec_get_context_defaults3
(
st
->
codec
,
codec
);
...
...
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