[vlc-commits] commit: codec/avcodec: fix late frames skipping with h264 ( use AVDISCARD_NONREF instead of AVDISCARD_BIDIR) (Gildas Bazin )

[git at videolan.org]

vlc | branch: master | Gildas Bazin <gbazin at videolan.org> | Thu Jan  6 20:42:45 2011 +0000| [2636de444c232f6ca2e809451fadd574ffa4bfa8] | committer: Gildas Bazin 

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2636de444c232f6ca2e809451fadd574ffa4bfa8
---

 modules/codec/avcodec/video.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index f821d78..01ab782 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -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
         {