Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
6d383e69
Commit
6d383e69
authored
Jul 01, 2015
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Map G2M3 and G2M2
Close #2327
parent
910e2082
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
modules/codec/avcodec/fourcc.c
modules/codec/avcodec/fourcc.c
+4
-1
No files found.
modules/codec/avcodec/fourcc.c
View file @
6d383e69
...
...
@@ -259,7 +259,10 @@ static const struct
#if LIBAVCODEC_VERSION_CHECK( 56, 23, 0, 35, 100 )
{
VLC_CODEC_HQ_HQA
,
AV_CODEC_ID_HQ_HQA
,
VIDEO_ES
},
#endif
#if LIBAVCODEC_VERSION_CHECK( 56, 31, 0, 46, 100 )
{
VLC_CODEC_G2M2
,
AV_CODEC_ID_G2M
,
VIDEO_ES
},
{
VLC_CODEC_G2M3
,
AV_CODEC_ID_G2M
,
VIDEO_ES
},
#endif
/* ffmpeg only: AV_CODEC_ID_BRENDER_PIX */
/* ffmpeg only: AV_CODEC_ID_Y41P */
...
...
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