Browse Source

matroskadec: simplify additional_id writing code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.2
Michael Niedermayer 12 years ago
parent
commit
a08ebf04b1
1 changed files with 2 additions and 4 deletions
  1. +2
    -4
      libavformat/matroskadec.c

+ 2
- 4
libavformat/matroskadec.c View File

@@ -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));
uint8_t additional_id_buf[8];
additional_size + 8);
if(side_data == NULL) { if(side_data == NULL) {
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
AV_WB64(additional_id_buf, additional_id);
memcpy(side_data, additional_id_buf, 8);
AV_WB64(side_data, additional_id);
memcpy(side_data + 8, additional, additional_size); memcpy(side_data + 8, additional, additional_size);
} }




Loading…
Cancel
Save