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
a2896580
Commit
a2896580
authored
Jul 10, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: allow codec NONE in the table (refs #8887)
parent
84383912
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
modules/codec/avcodec/fourcc.c
modules/codec/avcodec/fourcc.c
+5
-4
No files found.
modules/codec/avcodec/fourcc.c
View file @
a2896580
...
@@ -445,15 +445,16 @@ static const struct
...
@@ -445,15 +445,16 @@ static const struct
{
VLC_CODEC_XSUB
,
AV_CODEC_ID_XSUB
,
SPU_ES
},
{
VLC_CODEC_XSUB
,
AV_CODEC_ID_XSUB
,
SPU_ES
},
{
VLC_CODEC_SSA
,
AV_CODEC_ID_SSA
,
SPU_ES
},
{
VLC_CODEC_SSA
,
AV_CODEC_ID_SSA
,
SPU_ES
},
{
VLC_CODEC_TELETEXT
,
AV_CODEC_ID_DVB_TELETEXT
,
SPU_ES
},
{
VLC_CODEC_TELETEXT
,
AV_CODEC_ID_DVB_TELETEXT
,
SPU_ES
},
{
0
,
0
,
UNKNOWN_ES
}
};
};
static
const
size_t
codecs_count
=
sizeof
(
codecs_table
)
/
sizeof
(
codecs_table
[
0
]);
int
GetFfmpegCodec
(
vlc_fourcc_t
i_fourcc
,
int
*
pi_cat
,
int
GetFfmpegCodec
(
vlc_fourcc_t
i_fourcc
,
int
*
pi_cat
,
int
*
pi_ffmpeg_codec
,
const
char
**
ppsz_name
)
int
*
pi_ffmpeg_codec
,
const
char
**
ppsz_name
)
{
{
i_fourcc
=
vlc_fourcc_GetCodec
(
UNKNOWN_ES
,
i_fourcc
);
i_fourcc
=
vlc_fourcc_GetCodec
(
UNKNOWN_ES
,
i_fourcc
);
for
(
unsigned
i
=
0
;
codecs_table
[
i
].
i_fourcc
!=
0
;
i
++
)
for
(
unsigned
i
=
0
;
i
<
codecs_count
;
i
++
)
{
{
if
(
codecs_table
[
i
].
i_fourcc
==
i_fourcc
)
if
(
codecs_table
[
i
].
i_fourcc
==
i_fourcc
)
{
{
...
@@ -470,7 +471,7 @@ int GetFfmpegCodec( vlc_fourcc_t i_fourcc, int *pi_cat,
...
@@ -470,7 +471,7 @@ int GetFfmpegCodec( vlc_fourcc_t i_fourcc, int *pi_cat,
int
GetVlcFourcc
(
int
i_ffmpeg_codec
,
int
*
pi_cat
,
int
GetVlcFourcc
(
int
i_ffmpeg_codec
,
int
*
pi_cat
,
vlc_fourcc_t
*
pi_fourcc
,
const
char
**
ppsz_name
)
vlc_fourcc_t
*
pi_fourcc
,
const
char
**
ppsz_name
)
{
{
for
(
unsigned
i
=
0
;
codecs_table
[
i
].
i_codec
!=
0
;
i
++
)
for
(
unsigned
i
=
0
;
i
<
codecs_count
;
i
++
)
{
{
if
(
codecs_table
[
i
].
i_codec
==
i_ffmpeg_codec
)
if
(
codecs_table
[
i
].
i_codec
==
i_ffmpeg_codec
)
{
{
...
...
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