Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
conda
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
bob
conda
Commits
d5ebabfa
Commit
d5ebabfa
authored
6 years ago
by
Amir MOHAMMADI
Browse files
Options
Downloads
Plain Diff
Merge branch 'ffmpeg' into 'master'
[ffmpeg] Bump to version 4 See merge request bob/bob.conda!381
parents
1ccf2db0
c97b639a
Branches
master
No related tags found
Loading
Checking pipeline status
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
conda/ffmpeg/build.sh
+14
-11
14 additions, 11 deletions
conda/ffmpeg/build.sh
conda/ffmpeg/meta.yaml
+31
-8
31 additions, 8 deletions
conda/ffmpeg/meta.yaml
conda/ffmpeg/patch-libavcodec-videotoolboxenc.c-drop-Nullable.patch
+11
-0
11 additions, 0 deletions
...eg/patch-libavcodec-videotoolboxenc.c-drop-Nullable.patch
with
56 additions
and
19 deletions
Loading
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
