Merge commit '766df7ca89a2398e71182f5f2b46053e3aa9bd69'

* commit '766df7ca89a2398e71182f5f2b46053e3aa9bd69':
  dxva2: Add missing #includes

See: 9056d0c94a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/54/head
Michael Niedermayer 11 years ago
commit 075989c33c
  1. 9
      libavcodec/dxva2.c

@ -20,9 +20,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "dxva2_internal.h" #include <assert.h>
#include <string.h>
#include "libavutil/log.h"
#include "libavutil/time.h" #include "libavutil/time.h"
#include "avcodec.h"
#include "mpegvideo.h"
#include "dxva2_internal.h"
void *ff_dxva2_get_surface(const Picture *picture) void *ff_dxva2_get_surface(const Picture *picture)
{ {
return picture->f.data[3]; return picture->f.data[3];

Loading…
Cancel
Save