Changeset 1ec295a5 in ffmpeg

Timestamp:

Mar 20, 2014, 9:48:58 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

19139d85

Parents:

4d216420 (diff), 1b1094a1 (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 21:47:29)

git-committer:

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

Message:

Merge commit '1b1094a19d9e41baf3253c83841f9e5343cecbd0'

• commit '1b1094a19d9e41baf3253c83841f9e5343cecbd0': vdpau: switch ff_vdpau_get_surface_id from Picture to AVFrame

Conflicts:

libavcodec/vdpau_internal.h
libavcodec/vdpau_vc1.c

See: 2a37e560dccb81328f610c51e74ce6cc53f1a5c7
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)