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
0b360cae
Commit
0b360cae
authored
Apr 12, 2018
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make swresample optional for ffmpeg
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
d06b01fc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
configure
configure
+1
-1
ffmpeg_opt.c
fftools/ffmpeg_opt.c
+2
-0
No files found.
configure
View file @
0b360cae
...
@@ -3459,7 +3459,7 @@ avfilter_extralibs="pthreads_extralibs"
...
@@ -3459,7 +3459,7 @@ avfilter_extralibs="pthreads_extralibs"
avutil_extralibs
=
"d3d11va_extralibs nanosleep_extralibs pthreads_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vdpau_x11_extralibs"
avutil_extralibs
=
"d3d11va_extralibs nanosleep_extralibs pthreads_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vdpau_x11_extralibs"
# programs
# programs
ffmpeg_deps
=
"avcodec avfilter avformat
swresample
"
ffmpeg_deps
=
"avcodec avfilter avformat"
ffmpeg_select
=
"aformat_filter anull_filter atrim_filter format_filter
ffmpeg_select
=
"aformat_filter anull_filter atrim_filter format_filter
null_filter
null_filter
trim_filter"
trim_filter"
...
...
fftools/ffmpeg_opt.c
View file @
0b360cae
...
@@ -3157,7 +3157,9 @@ void show_help_default(const char *opt, const char *arg)
...
@@ -3157,7 +3157,9 @@ void show_help_default(const char *opt, const char *arg)
#if CONFIG_SWSCALE
#if CONFIG_SWSCALE
show_help_children
(
sws_get_class
(),
flags
);
show_help_children
(
sws_get_class
(),
flags
);
#endif
#endif
#if CONFIG_SWRESAMPLE
show_help_children
(
swr_get_class
(),
AV_OPT_FLAG_AUDIO_PARAM
);
show_help_children
(
swr_get_class
(),
AV_OPT_FLAG_AUDIO_PARAM
);
#endif
show_help_children
(
avfilter_get_class
(),
AV_OPT_FLAG_VIDEO_PARAM
|
AV_OPT_FLAG_AUDIO_PARAM
|
AV_OPT_FLAG_FILTERING_PARAM
);
show_help_children
(
avfilter_get_class
(),
AV_OPT_FLAG_VIDEO_PARAM
|
AV_OPT_FLAG_AUDIO_PARAM
|
AV_OPT_FLAG_FILTERING_PARAM
);
show_help_children
(
av_bsf_get_class
(),
AV_OPT_FLAG_VIDEO_PARAM
|
AV_OPT_FLAG_AUDIO_PARAM
|
AV_OPT_FLAG_BSF_PARAM
);
show_help_children
(
av_bsf_get_class
(),
AV_OPT_FLAG_VIDEO_PARAM
|
AV_OPT_FLAG_AUDIO_PARAM
|
AV_OPT_FLAG_BSF_PARAM
);
}
}
...
...
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