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
04ed5db1
Commit
04ed5db1
authored
Dec 29, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support for Indeo4 decoding
parent
6fb10a6f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
include/vlc_fourcc.h
include/vlc_fourcc.h
+3
-2
modules/codec/avcodec/fourcc.c
modules/codec/avcodec/fourcc.c
+4
-0
src/misc/fourcc.c
src/misc/fourcc.c
+4
-0
No files found.
include/vlc_fourcc.h
View file @
04ed5db1
...
@@ -71,7 +71,6 @@
...
@@ -71,7 +71,6 @@
#define VLC_CODEC_SP5X VLC_FOURCC('S','P','5','X')
#define VLC_CODEC_SP5X VLC_FOURCC('S','P','5','X')
#define VLC_CODEC_DV VLC_FOURCC('d','v',' ',' ')
#define VLC_CODEC_DV VLC_FOURCC('d','v',' ',' ')
#define VLC_CODEC_MSRLE VLC_FOURCC('m','r','l','e')
#define VLC_CODEC_MSRLE VLC_FOURCC('m','r','l','e')
#define VLC_CODEC_INDEO3 VLC_FOURCC('I','V','3','1')
#define VLC_CODEC_HUFFYUV VLC_FOURCC('H','F','Y','U')
#define VLC_CODEC_HUFFYUV VLC_FOURCC('H','F','Y','U')
#define VLC_CODEC_FFVHUFF VLC_FOURCC('F','F','V','H')
#define VLC_CODEC_FFVHUFF VLC_FOURCC('F','F','V','H')
#define VLC_CODEC_ASV1 VLC_FOURCC('A','S','V','1')
#define VLC_CODEC_ASV1 VLC_FOURCC('A','S','V','1')
...
@@ -98,6 +97,9 @@
...
@@ -98,6 +97,9 @@
#define VLC_CODEC_WNV1 VLC_FOURCC('W','N','V','1')
#define VLC_CODEC_WNV1 VLC_FOURCC('W','N','V','1')
#define VLC_CODEC_AASC VLC_FOURCC('A','A','S','C')
#define VLC_CODEC_AASC VLC_FOURCC('A','A','S','C')
#define VLC_CODEC_INDEO2 VLC_FOURCC('I','V','2','0')
#define VLC_CODEC_INDEO2 VLC_FOURCC('I','V','2','0')
#define VLC_CODEC_INDEO3 VLC_FOURCC('I','V','3','1')
#define VLC_CODEC_INDEO4 VLC_FOURCC('I','V','4','1')
#define VLC_CODEC_INDEO5 VLC_FOURCC('I','V','5','0')
#define VLC_CODEC_FLASHSV VLC_FOURCC('F','S','V','1')
#define VLC_CODEC_FLASHSV VLC_FOURCC('F','S','V','1')
#define VLC_CODEC_KMVC VLC_FOURCC('K','M','V','C')
#define VLC_CODEC_KMVC VLC_FOURCC('K','M','V','C')
#define VLC_CODEC_SMACKVIDEO VLC_FOURCC('S','M','K','2')
#define VLC_CODEC_SMACKVIDEO VLC_FOURCC('S','M','K','2')
...
@@ -113,7 +115,6 @@
...
@@ -113,7 +115,6 @@
#define VLC_CODEC_CDG VLC_FOURCC('C','D','G',' ')
#define VLC_CODEC_CDG VLC_FOURCC('C','D','G',' ')
#define VLC_CODEC_FRWU VLC_FOURCC('F','R','W','U')
#define VLC_CODEC_FRWU VLC_FOURCC('F','R','W','U')
#define VLC_CODEC_AMV VLC_FOURCC('A','M','V',' ')
#define VLC_CODEC_AMV VLC_FOURCC('A','M','V',' ')
#define VLC_CODEC_INDEO5 VLC_FOURCC('I','V','5','0')
#define VLC_CODEC_VP8 VLC_FOURCC('V','P','8','0')
#define VLC_CODEC_VP8 VLC_FOURCC('V','P','8','0')
#define VLC_CODEC_JPEG2000 VLC_FOURCC('J','P','2','K')
#define VLC_CODEC_JPEG2000 VLC_FOURCC('J','P','2','K')
#define VLC_CODEC_LAGARITH VLC_FOURCC('L','A','G','S')
#define VLC_CODEC_LAGARITH VLC_FOURCC('L','A','G','S')
...
...
modules/codec/avcodec/fourcc.c
View file @
04ed5db1
...
@@ -235,6 +235,10 @@ static const struct
...
@@ -235,6 +235,10 @@ static const struct
{
VLC_CODEC_PRORES
,
CODEC_ID_PRORES
,
VIDEO_ES
},
{
VLC_CODEC_PRORES
,
CODEC_ID_PRORES
,
VIDEO_ES
},
#endif
#endif
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 53, 32, 0 )
{
VLC_CODEC_PRORES
,
CODEC_ID_INDEO4
,
VIDEO_ES
},
#endif
#if 0
#if 0
/* UNTESTED VideoGames*/
/* UNTESTED VideoGames*/
...
...
src/misc/fourcc.c
View file @
04ed5db1
...
@@ -669,6 +669,10 @@ static const entry_t p_list_video[] = {
...
@@ -669,6 +669,10 @@ static const entry_t p_list_video[] = {
B
(
VLC_CODEC_FRWU
,
"Forward Uncompressed"
),
B
(
VLC_CODEC_FRWU
,
"Forward Uncompressed"
),
A
(
"FRWU"
),
A
(
"FRWU"
),
B
(
VLC_CODEC_INDEO4
,
"Indeo Video v4"
),
A
(
"IV41"
),
A
(
"iv41"
),
B
(
VLC_CODEC_INDEO5
,
"Indeo Video v5"
),
B
(
VLC_CODEC_INDEO5
,
"Indeo Video v5"
),
A
(
"IV50"
),
A
(
"IV50"
),
A
(
"iv50"
),
A
(
"iv50"
),
...
...
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