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

Merge commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f' 

* commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f':
  vdpau: Adjust necessary #includes for vdpau_internal.h

Conflicts:
	libavcodec/vdpau_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-14 22:51:27 +01:00
parent dfa7cb646d ecbcebde34
commit e33b084ee9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/vdpau_internal.h
View File

@ -31,10 +31,10 @@
#endif
#include "h264.h"
#include "libavutil/frame.h"
#include "avcodec.h"
#include "mpeg4video.h"
#include "mpegvideo.h"
#include "version.h"
/** Extract VdpVideoSurface from an AVFrame */
static inline uintptr_t ff_vdpau_get_surface_id(AVFrame *pic)

1
libavcodec/vdpau_mpeg12.c
View File

@ -24,6 +24,7 @@
#include <vdpau/vdpau.h>
#include "avcodec.h"
#include "mpegvideo.h"
#include "vdpau.h"
#include "vdpau_internal.h"