Merge commit '67afcefb35932b420998f6f3fda46c7c85848a3f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 23:57:02 +0000 (01:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 23:57:02 +0000 (01:57 +0200)
commit5449239a031e657cfe364521d2b6d58c0ef0e7f0
treec7293a1078cf2840bbe3515e6ab2d56f7f64ee9b
parentc6a683bf2291344238cb1fc2bd84c91fa1acd3bc
parent67afcefb35932b420998f6f3fda46c7c85848a3f
Merge commit '67afcefb35932b420998f6f3fda46c7c85848a3f'

* commit '67afcefb35932b420998f6f3fda46c7c85848a3f':
  lavc: Add new VDA hwaccel

Conflicts:
configure
libavcodec/vda.h
libavcodec/vda_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/h264_slice.c
libavcodec/vda.c
libavcodec/vda.h
libavcodec/vda_h264.c
libavcodec/vda_internal.h