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
02108269
Commit
02108269
authored
Oct 02, 2014
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: map AV_CODEC_ID_NONE
(cherry picked from commit 97ef3628415ece0ee2931e70cab424d5446eb64b)
parent
12abe1c7
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
2 deletions
+9
-2
modules/codec/avcodec/avcodec.c
modules/codec/avcodec/avcodec.c
+2
-1
modules/codec/avcodec/encoder.c
modules/codec/avcodec/encoder.c
+3
-0
modules/codec/avcodec/fourcc.c
modules/codec/avcodec/fourcc.c
+2
-0
modules/demux/avformat/mux.c
modules/demux/avformat/mux.c
+2
-1
No files found.
modules/codec/avcodec/avcodec.c
View file @
02108269
...
@@ -263,7 +263,8 @@ static int OpenDecoder( vlc_object_t *p_this )
...
@@ -263,7 +263,8 @@ static int OpenDecoder( vlc_object_t *p_this )
/* *** determine codec type *** */
/* *** determine codec type *** */
if
(
!
GetFfmpegCodec
(
p_dec
->
fmt_in
.
i_codec
,
&
i_cat
,
&
i_codec_id
,
if
(
!
GetFfmpegCodec
(
p_dec
->
fmt_in
.
i_codec
,
&
i_cat
,
&
i_codec_id
,
&
psz_namecodec
)
)
&
psz_namecodec
)
||
i_cat
==
UNKNOWN_ES
)
{
{
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
...
modules/codec/avcodec/encoder.c
View file @
02108269
...
@@ -281,6 +281,9 @@ int OpenEncoder( vlc_object_t *p_this )
...
@@ -281,6 +281,9 @@ int OpenEncoder( vlc_object_t *p_this )
psz_namecodec
=
"Raw video"
;
psz_namecodec
=
"Raw video"
;
}
}
if
(
i_cat
==
UNKNOWN_ES
)
return
VLC_EGENERIC
;
if
(
p_enc
->
fmt_out
.
i_cat
==
VIDEO_ES
&&
i_cat
!=
VIDEO_ES
)
if
(
p_enc
->
fmt_out
.
i_cat
==
VIDEO_ES
&&
i_cat
!=
VIDEO_ES
)
{
{
msg_Err
(
p_enc
,
"
\"
%s
\"
is not a video encoder"
,
psz_namecodec
);
msg_Err
(
p_enc
,
"
\"
%s
\"
is not a video encoder"
,
psz_namecodec
);
...
...
modules/codec/avcodec/fourcc.c
View file @
02108269
...
@@ -43,6 +43,8 @@ static const struct
...
@@ -43,6 +43,8 @@ static const struct
int
i_cat
;
int
i_cat
;
}
codecs_table
[]
=
}
codecs_table
[]
=
{
{
{
0
,
AV_CODEC_ID_NONE
,
UNKNOWN_ES
},
/*
/*
* Video Codecs
* Video Codecs
*/
*/
...
...
modules/demux/avformat/mux.c
View file @
02108269
...
@@ -180,7 +180,8 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
...
@@ -180,7 +180,8 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
msg_Dbg
(
p_mux
,
"adding input"
);
msg_Dbg
(
p_mux
,
"adding input"
);
if
(
!
GetFfmpegCodec
(
fmt
->
i_codec
,
0
,
&
i_codec_id
,
0
)
)
if
(
!
GetFfmpegCodec
(
fmt
->
i_codec
,
0
,
&
i_codec_id
,
0
)
||
i_codec_id
==
AV_CODEC_ID_NONE
)
{
{
msg_Dbg
(
p_mux
,
"couldn't find codec for fourcc '%4.4s'"
,
msg_Dbg
(
p_mux
,
"couldn't find codec for fourcc '%4.4s'"
,
(
char
*
)
&
fmt
->
i_codec
);
(
char
*
)
&
fmt
->
i_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