Re: pkg/34980

[David Howland <dhowland%users.sourceforge.net@localhost>]

The following reply was made to PR pkg/34980; it has been noted by GNATS.

From: David Howland <dhowland%users.sourceforge.net@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/34980
Date: Tue, 07 Nov 2006 20:07:23 -0500

 This is a multi-part message in MIME format.
 --------------090506000401050809000300
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Here are the patches to force it to compile on my NetBSD-3.1 box
 
 diff -u libavcodec/h264.c.orig libavcodec/h264.c >h263.c.diff
 diff -u libavcodec/cabac.h.orig libavcodec/cabac.h >cabac.h.diff
 
 (attached)
 
 -d
 
 --------------090506000401050809000300
 Content-Type: text/plain;
  name="h264.c.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="h264.c.diff"
 
 --- libavcodec/h264.c.orig     2006-11-07 19:11:41.000000000 -0500
 +++ libavcodec/h264.c  2006-11-07 19:12:35.000000000 -0500
 @@ -6033,14 +6033,14 @@
  
      return ctx + 4 * cat;
  }
 -
 +/*
  static const __attribute((used)) uint8_t last_coeff_flag_offset_8x8[63] = {
      0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
      2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
      3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,
      5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8
  };
 -
 +*/
  static int decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, 
int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff) {
      const int mb_xy  = h->s.mb_x + h->s.mb_y*h->s.mb_stride;
      static const int significant_coeff_flag_offset[2][6] = {
 
 --------------090506000401050809000300
 Content-Type: text/plain;
  name="cabac.h.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="cabac.h.diff"
 
 --- libavcodec/cabac.h.orig    2006-11-07 18:55:02.000000000 -0500
 +++ libavcodec/cabac.h 2006-11-07 19:09:28.000000000 -0500
 @@ -53,6 +53,13 @@
  extern uint8_t ff_h264_lps_state[2*64];     ///< transIdxLPS
  extern const uint8_t ff_h264_norm_shift[512];
  
 +static const uint8_t last_coeff_flag_offset_8x8[63] = {
 +    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 +    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
 +    3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,
 +    5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8
 +}; 
 +
  
  void ff_init_cabac_encoder(CABACContext *c, uint8_t *buf, int buf_size);
  void ff_init_cabac_decoder(CABACContext *c, const uint8_t *buf, int buf_size);
 
 --------------090506000401050809000300--