Commit 6aeb9a24 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

avcodec: missing error handling in lavc_UpdateVideoFormat()

parent 82985a6f
...@@ -146,12 +146,8 @@ static int lavc_UpdateVideoFormat( decoder_t *p_dec, ...@@ -146,12 +146,8 @@ static int lavc_UpdateVideoFormat( decoder_t *p_dec,
} }
if( !hwaccel && GetVlcChroma( &p_dec->fmt_out.video, p_context->pix_fmt ) ) if( !hwaccel && GetVlcChroma( &p_dec->fmt_out.video, p_context->pix_fmt ) )
{ return -1;
/* 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;
}
p_dec->fmt_out.i_codec = p_dec->fmt_out.video.i_chroma; 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 */ /* 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, ...@@ -192,8 +188,8 @@ static int lavc_UpdateVideoFormat( decoder_t *p_dec,
static inline picture_t *ffmpeg_NewPictBuf( decoder_t *p_dec, static inline picture_t *ffmpeg_NewPictBuf( decoder_t *p_dec,
AVCodecContext *p_context ) AVCodecContext *p_context )
{ {
lavc_UpdateVideoFormat( p_dec, p_context ); if (lavc_UpdateVideoFormat(p_dec, p_context))
/* FIXME: check for error ^^ and return NULL */ return NULL;
return decoder_NewPicture( p_dec ); return decoder_NewPicture( p_dec );
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment