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
6aeb9a24
Commit
6aeb9a24
authored
Apr 23, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: missing error handling in lavc_UpdateVideoFormat()
parent
82985a6f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
8 deletions
+4
-8
modules/codec/avcodec/video.c
modules/codec/avcodec/video.c
+4
-8
No files found.
modules/codec/avcodec/video.c
View file @
6aeb9a24
...
...
@@ -146,12 +146,8 @@ static int lavc_UpdateVideoFormat( decoder_t *p_dec,
}
if
(
!
hwaccel
&&
GetVlcChroma
(
&
p_dec
->
fmt_out
.
video
,
p_context
->
pix_fmt
)
)
{
/* we are doomed, but not really, because most codecs set their pix_fmt
* much later
* FIXME does it make sense here ? */
p_dec
->
fmt_out
.
video
.
i_chroma
=
VLC_CODEC_I420
;
}
return
-
1
;
p_dec
->
fmt_out
.
i_codec
=
p_dec
->
fmt_out
.
video
.
i_chroma
;
/* If an aspect-ratio was specified in the input format then force it */
...
...
@@ -192,8 +188,8 @@ static int lavc_UpdateVideoFormat( decoder_t *p_dec,
static
inline
picture_t
*
ffmpeg_NewPictBuf
(
decoder_t
*
p_dec
,
AVCodecContext
*
p_context
)
{
lavc_UpdateVideoFormat
(
p_dec
,
p_context
);
/* FIXME: check for error ^^ and return NULL */
if
(
lavc_UpdateVideoFormat
(
p_dec
,
p_context
))
return
NULL
;
return
decoder_NewPicture
(
p_dec
);
}
...
...
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