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
c07bb6bd
Commit
c07bb6bd
authored
10 years ago
by
Eloi Bail
Committed by
Gerrit Code Review
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
daemon: enable image encoders in contrib
Refs #71918 Change-Id: I34aa7f0156559a332d648acbe5e8ee548bf04b1f
parent
fbf9f5e2
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
contrib/src/ffmpeg/rules.mak
+15
-0
15 additions, 0 deletions
contrib/src/ffmpeg/rules.mak
contrib/src/libav/rules.mak
+14
-0
14 additions, 0 deletions
contrib/src/libav/rules.mak
with
29 additions
and
0 deletions
contrib/src/ffmpeg/rules.mak
+
15
−
0
View file @
c07bb6bd
...
...
@@ -63,6 +63,21 @@ FFMPEGCONF += \
--enable-encoder
=
libspeex
\
--enable-decoder
=
libspeex
#encoders/decoders for images
FFMPEGCONF
+=
\
--enable-encoder
=
gif
\
--enable-decoder
=
gif
\
--enable-encoder
=
jpegls
\
--enable-decoder
=
jpegls
\
--enable-encoder
=
ljpeg
\
--enable-decoder
=
jpeg2000
\
--enable-encoder
=
png
\
--enable-decoder
=
png
\
--enable-encoder
=
bmp
\
--enable-decoder
=
bmp
\
--enable-encoder
=
tiff
\
--enable-decoder
=
tiff
FFMPEGCONF
+=
\
--enable-indev
=
dshow
\
--enable-dxva2
...
...
This diff is collapsed.
Click to expand it.
contrib/src/libav/rules.mak
+
14
−
0
View file @
c07bb6bd
...
...
@@ -57,6 +57,20 @@ LIBAVCONF += \
--enable-encoder
=
libspeex
\
--enable-decoder
=
libspeex
#encoders/decoders for images
LIBAVCONF
+=
\
--enable-encoder
=
gif
\
--enable-decoder
=
gif
\
--enable-encoder
=
jpegls
\
--enable-decoder
=
jpegls
\
--enable-encoder
=
ljpeg
\
--enable-decoder
=
jpeg2000
\
--enable-encoder
=
png
\
--enable-decoder
=
png
\
--enable-encoder
=
bmp
\
--enable-decoder
=
bmp
\
--enable-encoder
=
tiff
\
--enable-decoder
=
tiff
# Linux
ifndef
HAVE_ANDROID
LIBAVCONF
+=
\
...
...
This diff is collapsed.
Click to expand it.
Jami Bot
@RingBot
mentioned in commit
38863d2a
·
7 years ago
mentioned in commit
38863d2a
mentioned in commit 38863d2a56827e7017eb31148187b2b2f7e5de61
Toggle commit list
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