diff mbox

[FFmpeg-devel,v4,09/14] avcodec/videotoolbox: create avcC even when h264 extradata is missing

Message ID 20171110214059.84891-9-ffmpeg@tmm1.net
State Accepted
Commit 403d10a8b3cd9c0c9a4a034b95a4cb5ffc4b1112
Headers show

Commit Message

Aman Karmani Nov. 10, 2017, 9:40 p.m. UTC 
From: Aman Gupta <aman@tmm1.net>

Removes the avctx->extradata_size requirement when creating avcC/hvcC, since
avctx->extradata is only used in the esds code path.

This fixes an issue where the VideoToolbox decoder would not work unless
avformat_find_stream_info() was called.
---
 libavcodec/videotoolbox.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c
index 2496e4969c..ff8ba41821 100644
--- a/libavcodec/videotoolbox.c
+++ b/libavcodec/videotoolbox.c
@@ -702,7 +702,7 @@  static CFDictionaryRef videotoolbox_decoder_config_create(CMVideoCodecType codec
                          kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder,
                          kCFBooleanTrue);
 
-    if (avctx->extradata_size) {
+    if (1) {
         CFMutableDictionaryRef avc_info;
         CFDataRef data = NULL;
 
@@ -713,7 +713,8 @@  static CFDictionaryRef videotoolbox_decoder_config_create(CMVideoCodecType codec
 
         switch (codec_type) {
         case kCMVideoCodecType_MPEG4Video :
-            data = videotoolbox_esds_extradata_create(avctx);
+            if (avctx->extradata_size)
+                data = videotoolbox_esds_extradata_create(avctx);
             if (data)
                 CFDictionarySetValue(avc_info, CFSTR("esds"), data);
             break;