Commit c558fcf4 authored by James Almer's avatar James Almer

avformat/matroskadec: also export non-HDR10+ ITU-T T.35 payloads as BlockAdditional side data

Partially reverts a change from 88de01d8, and
2133cadf.
Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent b18a9c29
......@@ -3719,19 +3719,21 @@ static int matroska_parse_block_additional(MatroskaDemuxContext *matroska,
av_free(hdrplus);
return res;
}
break;
return 0;
}
default:
side_data = av_packet_new_side_data(pkt, AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
size + (size_t)8);
if (!side_data)
return AVERROR(ENOMEM);
AV_WB64(side_data, id);
memcpy(side_data + 8, data, size);
break;
}
side_data = av_packet_new_side_data(pkt, AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
size + (size_t)8);
if (!side_data)
return AVERROR(ENOMEM);
AV_WB64(side_data, id);
memcpy(side_data + 8, data, size);
return 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment