1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00

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>
This commit is contained in:
Michael Niedermayer
2014-11-25 04:12:22 +01:00
2 changed files with 2 additions and 0 deletions

View File

@@ -20,6 +20,7 @@
#define AVCODEC_HUFFYUVDSP_H #define AVCODEC_HUFFYUVDSP_H
#include <stdint.h> #include <stdint.h>
#include "config.h"
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
#define B 3 #define B 3

View File

@@ -21,6 +21,7 @@
#ifndef AVCODEC_SNOW_DWT_H #ifndef AVCODEC_SNOW_DWT_H
#define AVCODEC_SNOW_DWT_H #define AVCODEC_SNOW_DWT_H
#include <stddef.h>
#include <stdint.h> #include <stdint.h>
typedef int DWTELEM; typedef int DWTELEM;