Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
ECM
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Show more breadcrumbs
ECM
ECM
Commits
9a25c5cf
Commit
9a25c5cf
authored
5 years ago
by
Xiaozhong Xu
Browse files
Options
Downloads
Patches
Plain Diff
resolve conflicts between Q0481
parent
062a1a57
No related branches found
Branches containing commit
No related tags found
Tags containing commit
Loading
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/Lib/DecoderLib/VLCReader.cpp
+1
-6
1 addition, 6 deletions
source/Lib/DecoderLib/VLCReader.cpp
source/Lib/EncoderLib/VLCWriter.cpp
+1
-4
1 addition, 4 deletions
source/Lib/EncoderLib/VLCWriter.cpp
with
2 additions
and
10 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
