RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 09:52:17 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Partially reverts a change from 88de01d878, and
2133cadfcf.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2023-04-10 18:45:21 -03:00
parent b18a9c2971
commit c558fcf41e
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/matroskadec.c
View File

@ -3719,9 +3719,13 @@ static int matroska_parse_block_additional(MatroskaDemuxContext *matroska,
av_free(hdrplus); av_free(hdrplus);
return res; return res;
} }
break;
return 0;
} }
default: default:
break;
}
side_data = av_packet_new_side_data(pkt, AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, side_data = av_packet_new_side_data(pkt, AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
size + (size_t)8); size + (size_t)8);
if (!side_data) if (!side_data)
@ -3729,8 +3733,6 @@ static int matroska_parse_block_additional(MatroskaDemuxContext *matroska,
AV_WB64(side_data, id); AV_WB64(side_data, id);
memcpy(side_data + 8, data, size); memcpy(side_data + 8, data, size);
break;
}
return 0; return 0;
} }