Changeset 19139d85 in ffmpeg

Timestamp:

Mar 20, 2014, 10:08:58 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

45ad7bc4

Parents:

1ec295a5 (diff), 8b6136d3 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (03/20/14 22:07:10)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/20/14 22:08:58)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: vaapi: switch ff_vaapi_get_surface_id from Picture to AVFrame

Conflicts:

libavcodec/vaapi.c
libavcodec/vaapi_internal.h

See: 377cfc28a226a66d6f872f0a16b3811208011ebc
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)