Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
3216662a
Commit
3216662a
authored
5 years ago
by
Fredy Pulido
Browse files
Options
Downloads
Patches
Plain Diff
ffmpeg: removes duplicate code in makefile
Change-Id: Iddf7ecd564bb58ebb21ddec9659cc07224a548c0
parent
7149cbbb
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
contrib/src/ffmpeg/rules.mak
+1
-13
1 addition, 13 deletions
contrib/src/ffmpeg/rules.mak
with
1 addition
and
13 deletions
contrib/src/ffmpeg/rules.mak
+
1
−
13
View file @
3216662a
...
...
@@ -225,19 +225,7 @@ FFMPEGCONF += \
--enable-encoder
=
vp8_vaapi
\
--enable-encoder
=
mjpeg_vaapi
# ffnvcodec is not supported on ARM then we enable it here for i386 and x86_64
ifeq
($(ARCH),i386)
FFMPEGCONF
+=
--enable-cuvid
\
--enable-ffnvcodec
\
--enable-nvdec
\
--enable-nvenc
\
--enable-hwaccel
=
h264_nvdec
\
--enable-hwaccel
=
hevc_nvdec
\
--enable-hwaccel
=
vp8_nvdec
\
--enable-hwaccel
=
mjpeg_nvdec
\
--enable-encoder
=
h264_nvenc
\
--enable-encoder
=
hevc_nvenc
endif
ifeq
($(ARCH),x86_64)
ifeq
($(ARCH),$(filter $(ARCH),i386 x86_64))
FFMPEGCONF
+=
--enable-cuvid
\
--enable-ffnvcodec
\
--enable-nvdec
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment