]> git.sesse.net Git - ffmpeg/commit
Merge commit 'ce083282f0a8b7d63c4047c30b7bac498f9806dd'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Oct 2014 10:32:07 +0000 (12:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Oct 2014 10:38:26 +0000 (12:38 +0200)
commit10b6d7462cbf0d13913c9d07e85c79210427d71e
treeff6dffb91bb5c46b7aefcc5296523dacf67c1abb
parentb64b719ad5c212e197009fa3f1e7aa96255cbd28
parentce083282f0a8b7d63c4047c30b7bac498f9806dd
Merge commit 'ce083282f0a8b7d63c4047c30b7bac498f9806dd'

* commit 'ce083282f0a8b7d63c4047c30b7bac498f9806dd':
  vdpau: common support for managing the VdpDecoder in avcodec

Conflicts:
libavcodec/vdpau.c

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