Dirac: More formating

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/2/head
Jordi Ortiz 13 years ago committed by Michael Niedermayer
parent ca239e1c37
commit 49aa397414
  1. 3
      libavcodec/dirac_arith.c
  2. 2
      libavcodec/dirac_arith.h
  3. 3
      libavcodec/diracdec.c
  4. 4
      libavcodec/diracdsp.c

@ -20,13 +20,14 @@
*/
/**
* @file libavcodec/dirac_arith.c
* @file
* Arithmetic decoder for Dirac
* @author Marco Gerards <marco@gnu.org>
*/
#include "dirac_arith.h"
const uint16_t ff_dirac_prob[256] = {
0, 2, 5, 8, 11, 15, 20, 24,
29, 35, 41, 47, 53, 60, 67, 74,

@ -20,7 +20,7 @@
*/
/**
* @file libavcodec/dirac_arith.h
* @file
* Arithmetic decoder for Dirac
* @author Marco Gerards <marco@gnu.org>
*/

@ -37,8 +37,6 @@
#include "dirac.h"
#include "diracdsp.h"
#undef printf
/**
* The spec limits the number of wavelet decompositions to 4 for both
* level 1 (VC-2) and 128 (long-gop default).
@ -81,7 +79,6 @@
typedef struct {
AVFrame avframe;
int interpolated[3]; /* 1 if hpel[] is valid */
uint8_t *hpel[3][4];
uint8_t *hpel_base[3][4];

@ -20,7 +20,7 @@
#include "dsputil.h"
#include "diracdsp.h"
//MMX_DISABLE #include "libavcodec/x86/diracdsp_mmx.h"
/* MMX_DISABLE #include "libavcodec/x86/diracdsp_mmx.h" */
#define FILTER(src, stride) \
((21*((src)[ 0*stride] + (src)[1*stride]) \
@ -197,5 +197,5 @@ void ff_diracdsp_init(DiracDSPContext *c)
PIXFUNC(avg, 16);
PIXFUNC(avg, 32);
//MMX_DISABLE if (HAVE_MMX) ff_diracdsp_init_mmx(c);
/* MMX_DISABLE if (HAVE_MMX) ff_diracdsp_init_mmx(c); */
}

Loading…
Cancel
Save