Merge commit '31a46750c7eafe6bce6a3e4f09853cd0a585292b'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 23:04:27 +0000 (01:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 23:04:27 +0000 (01:04 +0200)
commitc6a683bf2291344238cb1fc2bd84c91fa1acd3bc
tree628b0e6541d0ff6224804d3c2ecb98147093bbb2
parent14aef38a698229f12bbf980b4e45f2ee55edfcfe
parent31a46750c7eafe6bce6a3e4f09853cd0a585292b
Merge commit '31a46750c7eafe6bce6a3e4f09853cd0a585292b'

* commit '31a46750c7eafe6bce6a3e4f09853cd0a585292b':
  vda: use hwaccel private data for internal bitstream buffer

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vda.h
libavcodec/vda_h264.c