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
6d07bbb9
Commit
6d07bbb9
authored
Jan 09, 2014
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Map Bink Audio and Video codecs
For some reasons, the video part does not work yet.
parent
3dfba478
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
3 deletions
+16
-3
include/vlc_fourcc.h
include/vlc_fourcc.h
+3
-0
modules/codec/avcodec/fourcc.c
modules/codec/avcodec/fourcc.c
+7
-3
src/misc/fourcc.c
src/misc/fourcc.c
+6
-0
No files found.
include/vlc_fourcc.h
View file @
6d07bbb9
...
@@ -136,6 +136,9 @@
...
@@ -136,6 +136,9 @@
#define VLC_CODEC_G2M2 VLC_FOURCC('G','2','M','2')
#define VLC_CODEC_G2M2 VLC_FOURCC('G','2','M','2')
#define VLC_CODEC_G2M3 VLC_FOURCC('G','2','M','3')
#define VLC_CODEC_G2M3 VLC_FOURCC('G','2','M','3')
#define VLC_CODEC_G2M4 VLC_FOURCC('G','2','M','4')
#define VLC_CODEC_G2M4 VLC_FOURCC('G','2','M','4')
#define VLC_CODEC_BINKVIDEO VLC_FOURCC('B','I','K','f')
#define VLC_CODEC_BINKAUDIO_DCT VLC_FOURCC('B','A','U','1')
#define VLC_CODEC_BINKAUDIO_RDFT VLC_FOURCC('B','A','U','2')
/* Planar YUV 4:1:0 Y:V:U */
/* Planar YUV 4:1:0 Y:V:U */
#define VLC_CODEC_YV9 VLC_FOURCC('Y','V','U','9')
#define VLC_CODEC_YV9 VLC_FOURCC('Y','V','U','9')
...
...
modules/codec/avcodec/fourcc.c
View file @
6d07bbb9
...
@@ -188,7 +188,9 @@ static const struct
...
@@ -188,7 +188,9 @@ static const struct
/* AV_CODEC_ID_CDGRAPHICS */
/* AV_CODEC_ID_CDGRAPHICS */
/* AV_CODEC_ID_R210 */
/* AV_CODEC_ID_R210 */
/* AV_CODEC_ID_ANM */
/* AV_CODEC_ID_ANM */
/* AV_CODEC_ID_BINKVIDEO */
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 55, 0 )
{
VLC_CODEC_BINKVIDEO
,
AV_CODEC_ID_BINKVIDEO
,
VIDEO_ES
},
#endif
/* AV_CODEC_ID_IFF_ILBM */
/* AV_CODEC_ID_IFF_ILBM */
/* AV_CODEC_ID_IFF_BYTERUN1 */
/* AV_CODEC_ID_IFF_BYTERUN1 */
/* AV_CODEC_ID_KGV1 */
/* AV_CODEC_ID_KGV1 */
...
@@ -414,8 +416,10 @@ static const struct
...
@@ -414,8 +416,10 @@ static const struct
{
VLC_CODEC_TRUEHD
,
AV_CODEC_ID_TRUEHD
,
AUDIO_ES
},
{
VLC_CODEC_TRUEHD
,
AV_CODEC_ID_TRUEHD
,
AUDIO_ES
},
{
VLC_CODEC_ALS
,
AV_CODEC_ID_MP4ALS
,
AUDIO_ES
},
{
VLC_CODEC_ALS
,
AV_CODEC_ID_MP4ALS
,
AUDIO_ES
},
{
VLC_CODEC_ATRAC1
,
AV_CODEC_ID_ATRAC1
,
AUDIO_ES
},
{
VLC_CODEC_ATRAC1
,
AV_CODEC_ID_ATRAC1
,
AUDIO_ES
},
/* AV_CODEC_ID_BINKAUDIO_RDFT */
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 55, 0 )
/* AV_CODEC_ID_BINKAUDIO_DCT */
{
VLC_CODEC_BINKAUDIO_DCT
,
AV_CODEC_ID_BINKAUDIO_DCT
,
AUDIO_ES
},
{
VLC_CODEC_BINKAUDIO_RDFT
,
AV_CODEC_ID_BINKAUDIO_RDFT
,
AUDIO_ES
},
#endif
{
VLC_CODEC_MP4A
,
AV_CODEC_ID_AAC_LATM
,
AUDIO_ES
},
{
VLC_CODEC_MP4A
,
AV_CODEC_ID_AAC_LATM
,
AUDIO_ES
},
/* AV_CODEC_ID_QDMC */
/* AV_CODEC_ID_QDMC */
/* AV_CODEC_ID_CELT */
/* AV_CODEC_ID_CELT */
...
...
src/misc/fourcc.c
View file @
6d07bbb9
...
@@ -678,6 +678,12 @@ static const staticentry_t p_list_video[] = {
...
@@ -678,6 +678,12 @@ static const staticentry_t p_list_video[] = {
B
(
VLC_CODEC_AMV
,
"AMV"
),
B
(
VLC_CODEC_AMV
,
"AMV"
),
B
(
VLC_CODEC_BINKVIDEO
,
"Bink Video"
),
B
(
VLC_CODEC_BINKAUDIO_DCT
,
"Bink Audio (DCT)"
),
B
(
VLC_CODEC_BINKAUDIO_RDFT
,
"Bink Audio (RDFT)"
),
/* */
/* */
B
(
VLC_CODEC_DNXHD
,
"DNxHD"
),
B
(
VLC_CODEC_DNXHD
,
"DNxHD"
),
A
(
"AVdn"
),
A
(
"AVdn"
),
...
...
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