Skip to content

V
vlc-1.1
Commit c58f5961 authored by Gildas Bazin's avatar Gildas Bazin Committed by Jean-Baptiste Kempf
Browse files
Options

codec/avcodec: fix late frames skipping with h264 (use AVDISCARD_NONREF instead of AVDISCARD_BIDIR) 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 535fc4ea
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/codec/avcodec/video.c
View file @ c58f5961
......@@ -256,7 +256,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
p_sys->p_context->skip_frame = AVDISCARD_DEFAULT;
break;
case 1:
p_sys->p_context->skip_frame = AVDISCARD_BIDIR;
p_sys->p_context->skip_frame = AVDISCARD_NONREF;
break;
case 2:
p_sys->p_context->skip_frame = AVDISCARD_NONKEY;
......@@ -279,7 +279,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
p_sys->p_context->skip_idct = AVDISCARD_DEFAULT;
break;
case 1:
p_sys->p_context->skip_idct = AVDISCARD_BIDIR;
p_sys->p_context->skip_idct = AVDISCARD_NONREF;
break;
case 2:
p_sys->p_context->skip_idct = AVDISCARD_NONKEY;
......@@ -482,8 +482,8 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
if( p_sys->i_late_frames < 12 )
{
p_sys->p_context->skip_frame =
(p_sys->i_skip_frame <= AVDISCARD_BIDIR) ?
AVDISCARD_BIDIR : p_sys->i_skip_frame;
(p_sys->i_skip_frame <= AVDISCARD_NONREF) ?
AVDISCARD_NONREF : p_sys->i_skip_frame;
}
else
{
......
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