[FFmpeg-soc] [soc]: r3875 - in dirac/libavcodec: dirac.h diracdec.c

[conrad]

Author: conrad
Date: Sat Dec  6 03:01:07 2008
New Revision: 3875

Log:
Remove picnum from DiracContext


Modified:
   dirac/libavcodec/dirac.h
   dirac/libavcodec/diracdec.c

Modified: dirac/libavcodec/dirac.h
==============================================================================
--- dirac/libavcodec/dirac.h	(original)
+++ dirac/libavcodec/dirac.h	Sat Dec  6 03:01:07 2008
@@ -162,7 +162,6 @@ typedef struct DiracContext {
 
     AVFrame picture;
 
-    uint32_t picnum;
     int refcnt;
     struct reference_frame refframes[REFFRAME_CNT]; /* XXX */
 

Modified: dirac/libavcodec/diracdec.c
==============================================================================
--- dirac/libavcodec/diracdec.c	(original)
+++ dirac/libavcodec/diracdec.c	Sat Dec  6 03:01:07 2008
@@ -708,17 +708,17 @@ static int parse_frame(DiracContext *s)
     int i;
     GetBitContext *gb = &s->gb;
 
-    s->picnum = get_bits_long(gb, 32);
+    s->picture.display_picture_number = get_bits_long(gb, 32);
 
     for (i = 0; i < s->refs; i++)
-        s->ref[i] = dirac_get_se_golomb(gb) + s->picnum;
+        s->ref[i] = dirac_get_se_golomb(gb) + s->picture.display_picture_number;
 
     /* Retire the reference frames that are not used anymore. */
     s->retirecnt = 0;
     if (s->picture.reference) {
         retire = dirac_get_se_golomb(gb);
         if (retire) {
-            s->retireframe[0] = s->picnum + retire;
+            s->retireframe[0] = s->picture.display_picture_number + retire;
             s->retirecnt = 1;
         }
     }
@@ -858,8 +858,6 @@ int dirac_decode_frame(AVCodecContext *a
     if (dirac_decode_frame_internal(s))
         return -1;
 
-    s->picture.display_picture_number = s->picnum;
-
     if (s->picture.reference
         || s->picture.display_picture_number != avctx->frame_number) {
         if (s->refcnt + 1 == REFFRAME_CNT) {