From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 5 Nov 2013 09:32:10 +0000 (+0100)
Subject: Merge commit '70cbf33405f50dfaf77e85f382a188acf17dc71a'
X-Git-Tag: android-x86-6.0-r1~9135
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e1459f4b0bb2482c40b458183f78feadb8fe417b;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '70cbf33405f50dfaf77e85f382a188acf17dc71a'

* commit '70cbf33405f50dfaf77e85f382a188acf17dc71a':
  vdpau: Add missing #includes to fix standalone header compilation

Conflicts:
	libavcodec/vdpau_internal.h

Not completely merged as this would break use of vdpau.h from C++

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

e1459f4b0bb2482c40b458183f78feadb8fe417b
diff --cc libavcodec/vdpau_internal.h
index b6701f30db,50c4f5e74c..32969963c7
--- a/libavcodec/vdpau_internal.h
+++ b/libavcodec/vdpau_internal.h
@@@ -24,14 -24,12 +24,16 @@@
  #ifndef AVCODEC_VDPAU_INTERNAL_H
  #define AVCODEC_VDPAU_INTERNAL_H
  
 +#include "config.h"
  #include <stdint.h>
 +#if CONFIG_VDPAU
  #include <vdpau/vdpau.h>
- #include "vdpau.h"
 +#endif
 +#include "h264.h"
+ 
+ #include "avcodec.h"
  #include "mpegvideo.h"
+ #include "version.h"
  
  /** Extract VdpVideoSurface from a Picture */
  static inline uintptr_t ff_vdpau_get_surface_id(Picture *pic)