diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 22:34:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 22:42:49 +0200 |
| commit | cc48409b51c8cd8fed8038c00ea8b4a6b2341004 (patch) | |
| tree | 5930e10fb3a32b0464962e222c816f16969bb2ed /libavcodec/vda_h264.c | |
| 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 'libavcodec/vda_h264.c')
| -rw-r--r-- | libavcodec/vda_h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vda_h264.c b/libavcodec/vda_h264.c index 8ea81d8d2e..4d2274d649 100644 --- a/libavcodec/vda_h264.c +++ b/libavcodec/vda_h264.c @@ -430,7 +430,7 @@ int ff_vda_default_init(AVCodecContext *avctx) CFMutableDictionaryRef buffer_attributes; CFMutableDictionaryRef io_surface_properties; CFNumberRef cv_pix_fmt; - int32_t fmt = 'avc1', pix_fmt = kCVPixelFormatType_422YpCbCr8; + int32_t fmt = 'avc1', pix_fmt = vda_ctx->cv_pix_fmt_type; // kCVPixelFormatType_420YpCbCr8Planar; |