Changeset c6a683bf in ffmpeg

Timestamp:

May 11, 2014, 11:04:27 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5449239a

Parents:

14aef38a (diff), 31a46750 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)