RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'cehoyos/master' 

* cehoyos/master:
  Fix make checkheaders for wavpackenc.h
  Fix make checkheaders for vdpau_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-31 13:55:34 +02:00
parent b043d80be4 b970f85564
commit 4fa00c567c
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/vdpau_internal.h
View File

@ -24,6 +24,7 @@
#ifndef AVCODEC_VDPAU_INTERNAL_H
#define AVCODEC_VDPAU_INTERNAL_H
#include "config.h"
#include <stdint.h>
#if CONFIG_VDPAU
#include <vdpau/vdpau.h>

2
libavcodec/wavpack.h
View File

@ -22,6 +22,8 @@
#ifndef AVCODEC_WAVPACK_H
#define AVCODEC_WAVPACK_H
#include "libavutil/common.h"
#define MAX_TERMS 16
#define MAX_TERM 8