Commit a8275171 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

ffmpeg chroma: stupid test mistake for the decoder. remove some overly "loud"...

ffmpeg chroma: stupid test mistake for the decoder. remove some overly "loud" errors, that are not really problems.
parent cd920984
...@@ -122,8 +122,7 @@ static inline picture_t *ffmpeg_NewPictBuf( decoder_t *p_dec, ...@@ -122,8 +122,7 @@ static inline picture_t *ffmpeg_NewPictBuf( decoder_t *p_dec,
if( GetVlcChroma( &p_dec->fmt_out.video, p_context->pix_fmt ) != VLC_SUCCESS ) if( GetVlcChroma( &p_dec->fmt_out.video, p_context->pix_fmt ) != VLC_SUCCESS )
{ {
/* we are doomed */ /* we are doomed, but not really, because most codecs set their pix_fmt much later */
msg_Err( p_dec, "avcodec does not know how to convert this chroma" );
p_dec->fmt_out.i_codec = VLC_FOURCC('I','4','2','0'); p_dec->fmt_out.i_codec = VLC_FOURCC('I','4','2','0');
} }
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;
...@@ -333,8 +332,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, ...@@ -333,8 +332,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
p_dec->fmt_out.i_cat = VIDEO_ES; p_dec->fmt_out.i_cat = VIDEO_ES;
if( GetVlcChroma( &p_dec->fmt_out.video, p_context->pix_fmt ) != VLC_SUCCESS ) if( GetVlcChroma( &p_dec->fmt_out.video, p_context->pix_fmt ) != VLC_SUCCESS )
{ {
/* we are doomed */ /* we are doomed. but not really, because most codecs set their pix_fmt later on */
msg_Err( p_dec, "avcodec does not know how to convert this chroma" );
p_dec->fmt_out.i_codec = VLC_FOURCC('I','4','2','0'); p_dec->fmt_out.i_codec = VLC_FOURCC('I','4','2','0');
} }
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;
...@@ -754,7 +752,7 @@ static void ffmpeg_CopyPicture( decoder_t *p_dec, ...@@ -754,7 +752,7 @@ static void ffmpeg_CopyPicture( decoder_t *p_dec,
{ {
decoder_sys_t *p_sys = p_dec->p_sys; decoder_sys_t *p_sys = p_dec->p_sys;
if( TestFfmpegChroma( p_sys->p_context->pix_fmt, -1 ) ) if( TestFfmpegChroma( p_sys->p_context->pix_fmt, -1 ) == VLC_SUCCESS )
{ {
int i_plane, i_size, i_line; int i_plane, i_size, i_line;
uint8_t *p_dst, *p_src; uint8_t *p_dst, *p_src;
......
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