virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-08 16:54:03 +02:00
Code Issues Releases Activity

matroskadec: simplify additional_id writing code

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-14 00:55:25 +01:00
parent 30c5c45b12
commit a08ebf04b1
1 changed files with 2 additions and 4 deletions

6
libavformat/matroskadec.c

@ -2131,13 +2131,11 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska,
if (additional_size > 0) { if (additional_size > 0) {
uint8_t *side_data = av_packet_new_side_data(pkt, uint8_t *side_data = av_packet_new_side_data(pkt,
AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
additional_size + sizeof(additional_id)); additional_size + 8);
uint8_t additional_id_buf[8];
if(side_data == NULL) { if(side_data == NULL) {
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
AV_WB64(additional_id_buf, additional_id); AV_WB64(side_data, additional_id);
memcpy(side_data, additional_id_buf, 8);
memcpy(side_data + 8, additional, additional_size); memcpy(side_data + 8, additional, additional_size);
} }