]> git.sesse.net Git - vlc/commitdiff
codec/avcodec: fix late frames skipping with h264 (use AVDISCARD_NONREF instead of...
authorGildas Bazin <gbazin@videolan.org>
Thu, 6 Jan 2011 20:42:45 +0000 (20:42 +0000)
committerGildas Bazin <gbazin@videolan.org>
Thu, 6 Jan 2011 21:20:49 +0000 (21:20 +0000)
modules/codec/avcodec/video.c

index f821d78f74f3c1cf9873b6fcaa223882ad3395c4..01ab782f3690ca1e1bd43e718b4605b524ec0180 100644 (file)
@@ -258,7 +258,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;
@@ -281,7 +281,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;
@@ -490,8 +490,8 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
         if( p_sys->i_late_frames < 12 )
         {
             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
         {