Browse Source

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Include config.h from huffyuvdsp.h.
  Include stddef from snow_dwt.h.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.5
Michael Niedermayer 11 years ago
parent
commit
67dbf8bec9
2 changed files with 2 additions and 0 deletions
  1. +1
    -0
      libavcodec/huffyuvdsp.h
  2. +1
    -0
      libavcodec/snow_dwt.h

+ 1
- 0
libavcodec/huffyuvdsp.h View File

@@ -20,6 +20,7 @@
#define AVCODEC_HUFFYUVDSP_H

#include <stdint.h>
#include "config.h"

#if HAVE_BIGENDIAN
#define B 3


+ 1
- 0
libavcodec/snow_dwt.h View File

@@ -21,6 +21,7 @@
#ifndef AVCODEC_SNOW_DWT_H
#define AVCODEC_SNOW_DWT_H

#include <stddef.h>
#include <stdint.h>

typedef int DWTELEM;


Loading…
Cancel
Save