ffmpeg | branch: master | Stefano Pigozzi <stefano.pigo...@gmail.com> | Fri Aug 21 08:56:24 2015 +0200| [78cc19f15ead41909ddaf85cd5bad10036a93883] | committer: wm4
videotoolbox: require hardware acceleration VideoToolbox also implements a software decoder for h264, and will fallback to using it if the file cannot be decoded on the GPU. In these cases though, we want the hwaccel to fail so that we can use the libavcodec software decoder instead of the Apple one. Signed-off-by: wm4 <nfx...@googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=78cc19f15ead41909ddaf85cd5bad10036a93883 --- libavcodec/videotoolbox.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index ca44491..9dec5fc 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -32,8 +32,8 @@ #include "h264.h" #include "mpegvideo.h" -#ifndef kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder -# define kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder CFSTR("EnableHardwareAcceleratedVideoDecoder") +#ifndef kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder +# define kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder CFSTR("RequireHardwareAcceleratedVideoDecoder") #endif #define VIDEOTOOLBOX_ESDS_EXTRADATA_PADDING 12 @@ -398,7 +398,7 @@ static CFDictionaryRef videotoolbox_decoder_config_create(CMVideoCodecType codec &kCFTypeDictionaryValueCallBacks); CFDictionarySetValue(config_info, - kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder, + kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder, kCFBooleanTrue); if (avctx->extradata_size) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
