Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
de5869fa
Commit
de5869fa
authored
Jun 15, 2004
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* G.726 support trough ffmpeg
parent
e444b4f6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
include/codecs.h
include/codecs.h
+2
-0
modules/codec/ffmpeg/ffmpeg.c
modules/codec/ffmpeg/ffmpeg.c
+6
-2
No files found.
include/codecs.h
View file @
de5869fa
...
@@ -137,6 +137,7 @@ typedef struct
...
@@ -137,6 +137,7 @@ typedef struct
#define WAVE_FORMAT_IMA_ADPCM 0x0011
/* Intel Corporation */
#define WAVE_FORMAT_IMA_ADPCM 0x0011
/* Intel Corporation */
#define WAVE_FORMAT_GSM610 0x0031
/* Microsoft Corporation */
#define WAVE_FORMAT_GSM610 0x0031
/* Microsoft Corporation */
#define WAVE_FORMAT_MSNAUDIO 0x0032
/* Microsoft Corporation */
#define WAVE_FORMAT_MSNAUDIO 0x0032
/* Microsoft Corporation */
#define WAVE_FORMAT_G726 0x0045
/* ITU-T standard */
#define WAVE_FORMAT_MPEG 0x0050
/* Microsoft Corporation */
#define WAVE_FORMAT_MPEG 0x0050
/* Microsoft Corporation */
#define WAVE_FORMAT_MPEGLAYER3 0x0055
/* ISO/MPEG Layer3 Format Tag */
#define WAVE_FORMAT_MPEGLAYER3 0x0055
/* ISO/MPEG Layer3 Format Tag */
#define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092
/* Sonic Foundry */
#define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092
/* Sonic Foundry */
...
@@ -191,6 +192,7 @@ wave_format_tag_to_fourcc[] =
...
@@ -191,6 +192,7 @@ wave_format_tag_to_fourcc[] =
{
WAVE_FORMAT_ALAW
,
VLC_FOURCC
(
'a'
,
'l'
,
'a'
,
'w'
),
"A-Law"
},
{
WAVE_FORMAT_ALAW
,
VLC_FOURCC
(
'a'
,
'l'
,
'a'
,
'w'
),
"A-Law"
},
{
WAVE_FORMAT_MULAW
,
VLC_FOURCC
(
'm'
,
'l'
,
'a'
,
'w'
),
"Mu-Law"
},
{
WAVE_FORMAT_MULAW
,
VLC_FOURCC
(
'm'
,
'l'
,
'a'
,
'w'
),
"Mu-Law"
},
{
WAVE_FORMAT_IMA_ADPCM
,
VLC_FOURCC
(
'm'
,
's'
,
0x00
,
0x11
),
"Ima-Adpcm"
},
{
WAVE_FORMAT_IMA_ADPCM
,
VLC_FOURCC
(
'm'
,
's'
,
0x00
,
0x11
),
"Ima-Adpcm"
},
{
WAVE_FORMAT_G726
,
VLC_FOURCC
(
'g'
,
'7'
,
'2'
,
'6'
),
"G.726 Adpcm"
},
{
WAVE_FORMAT_MPEGLAYER3
,
VLC_FOURCC
(
'm'
,
'p'
,
'g'
,
'a'
),
"Mpeg Audio"
},
{
WAVE_FORMAT_MPEGLAYER3
,
VLC_FOURCC
(
'm'
,
'p'
,
'g'
,
'a'
),
"Mpeg Audio"
},
{
WAVE_FORMAT_MPEG
,
VLC_FOURCC
(
'm'
,
'p'
,
'g'
,
'a'
),
"Mpeg Audio"
},
{
WAVE_FORMAT_MPEG
,
VLC_FOURCC
(
'm'
,
'p'
,
'g'
,
'a'
),
"Mpeg Audio"
},
{
WAVE_FORMAT_A52
,
VLC_FOURCC
(
'a'
,
'5'
,
'2'
,
' '
),
"A/52"
},
{
WAVE_FORMAT_A52
,
VLC_FOURCC
(
'a'
,
'5'
,
'2'
,
' '
),
"A/52"
},
...
...
modules/codec/ffmpeg/ffmpeg.c
View file @
de5869fa
...
@@ -569,7 +569,6 @@ static struct
...
@@ -569,7 +569,6 @@ static struct
VIDEO_ES
,
"Microsoft RLE Video"
},
VIDEO_ES
,
"Microsoft RLE Video"
},
#endif
#endif
#if( !defined( WORDS_BIGENDIAN ) )
/* Indeo Video Codecs (Quality of this decoder on ppc is not good) */
/* Indeo Video Codecs (Quality of this decoder on ppc is not good) */
{
VLC_FOURCC
(
'I'
,
'V'
,
'3'
,
'1'
),
CODEC_ID_INDEO3
,
{
VLC_FOURCC
(
'I'
,
'V'
,
'3'
,
'1'
),
CODEC_ID_INDEO3
,
VIDEO_ES
,
"Indeo Video v3"
},
VIDEO_ES
,
"Indeo Video v3"
},
...
@@ -579,7 +578,6 @@ static struct
...
@@ -579,7 +578,6 @@ static struct
VIDEO_ES
,
"Indeo Video v3"
},
VIDEO_ES
,
"Indeo Video v3"
},
{
VLC_FOURCC
(
'i'
,
'v'
,
'3'
,
'2'
),
CODEC_ID_INDEO3
,
{
VLC_FOURCC
(
'i'
,
'v'
,
'3'
,
'2'
),
CODEC_ID_INDEO3
,
VIDEO_ES
,
"Indeo Video v3"
},
VIDEO_ES
,
"Indeo Video v3"
},
#endif
/* Huff YUV */
/* Huff YUV */
{
VLC_FOURCC
(
'H'
,
'F'
,
'Y'
,
'U'
),
CODEC_ID_HUFFYUV
,
{
VLC_FOURCC
(
'H'
,
'F'
,
'Y'
,
'U'
),
CODEC_ID_HUFFYUV
,
...
@@ -752,6 +750,12 @@ static struct
...
@@ -752,6 +750,12 @@ static struct
AUDIO_ES
,
"Sierra VMD Audio"
},
AUDIO_ES
,
"Sierra VMD Audio"
},
#endif
#endif
#if LIBAVCODEC_BUILD >= 4706
/* G.726 ADPCM */
{
VLC_FOURCC
(
'g'
,
'7'
,
'2'
,
'6'
),
CODEC_ID_ADPCM_G726
,
AUDIO_ES
,
"G.726 ADPCM Audio"
},
#endif
/* PCM */
/* PCM */
{
VLC_FOURCC
(
's'
,
'8'
,
' '
,
' '
),
CODEC_ID_PCM_S8
,
{
VLC_FOURCC
(
's'
,
'8'
,
' '
,
' '
),
CODEC_ID_PCM_S8
,
AUDIO_ES
,
"PCM S8"
},
AUDIO_ES
,
"PCM S8"
},
...
...
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