diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 23:34:59 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 23:42:49 +0300 |
| commit | cc48409b51c8cd8fed8038c00ea8b4a6b2341004 (patch) | |
| tree | 5930e10fb3a32b0464962e222c816f16969bb2ed /libswresample | |
| parent | a3adba358bbb3e8f953b15ad2820a3ff996ef91b (diff) | |
| parent | e7c5e17d4fbd7c83fb331bf327e25ebd8e6a8623 (diff) | |
Merge commit 'e7c5e17d4fbd7c83fb331bf327e25ebd8e6a8623'
* commit 'e7c5e17d4fbd7c83fb331bf327e25ebd8e6a8623':
vda: Make output CVPixelBuffer format configurable
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions