diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 01:04:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 01:04:27 +0200 |
| commit | c6a683bf2291344238cb1fc2bd84c91fa1acd3bc (patch) | |
| tree | 628b0e6541d0ff6224804d3c2ecb98147093bbb2 /libavcodec/vda.c | |
| parent | 14aef38a698229f12bbf980b4e45f2ee55edfcfe (diff) | |
| parent | 31a46750c7eafe6bce6a3e4f09853cd0a585292b (diff) | |
| download | ffmpeg-c6a683bf2291344238cb1fc2bd84c91fa1acd3bc.tar.gz | |
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>
Diffstat (limited to 'libavcodec/vda.c')
0 files changed, 0 insertions, 0 deletions