Merge commit 'e7c5e17d4fbd7c83fb331bf327e25ebd8e6a8623'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 May 2015 20:34:59 +0000 (22:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 May 2015 20:42:49 +0000 (22:42 +0200)
commitcc48409b51c8cd8fed8038c00ea8b4a6b2341004
tree5930e10fb3a32b0464962e222c816f16969bb2ed
parenta3adba358bbb3e8f953b15ad2820a3ff996ef91b
parente7c5e17d4fbd7c83fb331bf327e25ebd8e6a8623
Merge commit 'e7c5e17d4fbd7c83fb331bf327e25ebd8e6a8623'

* commit 'e7c5e17d4fbd7c83fb331bf327e25ebd8e6a8623':
  vda: Make output CVPixelBuffer format configurable

Conflicts:
doc/APIchanges
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/vda.c
libavcodec/vda.h
libavcodec/vda_h264.c
libavcodec/version.h