Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
81758ac0
Commit
81758ac0
authored
Dec 20, 2010
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Try to decode WMVP with lavc WMV3's decoder
parent
b737cab7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
0 deletions
+8
-0
include/vlc_fourcc.h
include/vlc_fourcc.h
+1
-0
modules/codec/avcodec/fourcc.c
modules/codec/avcodec/fourcc.c
+3
-0
src/misc/fourcc.c
src/misc/fourcc.c
+4
-0
No files found.
include/vlc_fourcc.h
View file @
81758ac0
...
@@ -48,6 +48,7 @@
...
@@ -48,6 +48,7 @@
#define VLC_CODEC_WMV2 VLC_FOURCC('W','M','V','2')
#define VLC_CODEC_WMV2 VLC_FOURCC('W','M','V','2')
#define VLC_CODEC_WMV3 VLC_FOURCC('W','M','V','3')
#define VLC_CODEC_WMV3 VLC_FOURCC('W','M','V','3')
#define VLC_CODEC_WMVA VLC_FOURCC('W','M','V','A')
#define VLC_CODEC_WMVA VLC_FOURCC('W','M','V','A')
#define VLC_CODEC_WMVP VLC_FOURCC('W','M','V','P')
#define VLC_CODEC_VC1 VLC_FOURCC('V','C','-','1')
#define VLC_CODEC_VC1 VLC_FOURCC('V','C','-','1')
#define VLC_CODEC_THEORA VLC_FOURCC('t','h','e','o')
#define VLC_CODEC_THEORA VLC_FOURCC('t','h','e','o')
#define VLC_CODEC_TARKIN VLC_FOURCC('t','a','r','k')
#define VLC_CODEC_TARKIN VLC_FOURCC('t','a','r','k')
...
...
modules/codec/avcodec/fourcc.c
View file @
81758ac0
...
@@ -89,6 +89,9 @@ static const struct
...
@@ -89,6 +89,9 @@ static const struct
{
VLC_CODEC_WMV1
,
CODEC_ID_WMV1
,
VIDEO_ES
},
{
VLC_CODEC_WMV1
,
CODEC_ID_WMV1
,
VIDEO_ES
},
{
VLC_CODEC_WMV2
,
CODEC_ID_WMV2
,
VIDEO_ES
},
{
VLC_CODEC_WMV2
,
CODEC_ID_WMV2
,
VIDEO_ES
},
{
VLC_CODEC_WMV3
,
CODEC_ID_WMV3
,
VIDEO_ES
},
{
VLC_CODEC_WMV3
,
CODEC_ID_WMV3
,
VIDEO_ES
},
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 90, 1 )
{
VLC_CODEC_WMVP
,
CODEC_ID_WMV3
,
VIDEO_ES
},
#endif
{
VLC_CODEC_VC1
,
CODEC_ID_VC1
,
VIDEO_ES
},
{
VLC_CODEC_VC1
,
CODEC_ID_VC1
,
VIDEO_ES
},
{
VLC_CODEC_WMVA
,
CODEC_ID_VC1
,
VIDEO_ES
},
{
VLC_CODEC_WMVA
,
CODEC_ID_VC1
,
VIDEO_ES
},
...
...
src/misc/fourcc.c
View file @
81758ac0
...
@@ -392,6 +392,10 @@ static const entry_t p_list_video[] = {
...
@@ -392,6 +392,10 @@ static const entry_t p_list_video[] = {
A
(
"vc-1"
),
A
(
"vc-1"
),
A
(
"VC-1"
),
A
(
"VC-1"
),
B
(
VLC_CODEC_WMVP
,
"Windows Media Video Presentation"
),
A
(
"WMVP"
),
A
(
"wmvp"
),
/* Microsoft Video 1 */
/* Microsoft Video 1 */
B
(
VLC_CODEC_MSVIDEO1
,
"Microsoft Video 1"
),
B
(
VLC_CODEC_MSVIDEO1
,
"Microsoft Video 1"
),
A
(
"MSVC"
),
A
(
"MSVC"
),
...
...
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