Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
diff -ur a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c
--- a/libavcodec/videotoolbox.c
+++ b/libavcodec/videotoolbox.c
@@ -825,11 +825,18 @@
if (data)
CFDictionarySetValue(avc_info, CFSTR("esds"), data);
break;
- case kCMVideoCodecType_H264 :
+ case kCMVideoCodecType_H264 : {
+ H264Context *h = avctx->priv_data;
+ if (TARGET_OS_IPHONE && h->ps.sps->frame_mbs_only_flag == 0) {
+ av_log(avctx, AV_LOG_ERROR, "VideoToolbox cannot decode interlaced fields on iOS\n");
+ CFRelease(avc_info);
+ goto fail;
+ }
data = ff_videotoolbox_avcc_extradata_create(avctx);
if (data)
CFDictionarySetValue(avc_info, CFSTR("avcC"), data);
break;
+ }
case kCMVideoCodecType_HEVC :
data = ff_videotoolbox_hvcc_extradata_create(avctx);
if (data)
@@ -855,6 +862,10 @@

CFRelease(avc_info);
return config_info;
+
+fail:
+ CFRelease(config_info);
+ return NULL;
}

static int videotoolbox_start(AVCodecContext *avctx)
2 changes: 1 addition & 1 deletion inputstream.ffmpegdirect/addon.xml.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="inputstream.ffmpegdirect"
version="21.3.2"
version="21.3.3"
name="Inputstream FFmpeg Direct"
provider-name="Ross Nicholson">
<requires>@ADDON_DEPENDS@</requires>
Expand Down
4 changes: 4 additions & 0 deletions inputstream.ffmpegdirect/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
v21.3.3
- Patch to disable hardware acceleration for interlaced video on TvOS
- Patch to check for nullptr on surface for dxva2 on window

v21.3.2
- Fix deprecations for m_pFormatContext's codecpar->channels for streams ffmpeg6 and a single use of vsprintf

Expand Down