Commit 39fb1e96 authored by Andreas Rheinhardt's avatar Andreas Rheinhardt

avformat/matroskadec: Cosmetics

Reindentation as well as marking several variables used for demuxing
RealAudio as const to clearly see that they don't change during
demuxing.
Signed-off-by: 's avatarAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
parent 979b5b89
...@@ -3119,12 +3119,12 @@ static int matroska_parse_rm_audio(MatroskaDemuxContext *matroska, ...@@ -3119,12 +3119,12 @@ static int matroska_parse_rm_audio(MatroskaDemuxContext *matroska,
uint8_t *data, int size, uint64_t timecode, uint8_t *data, int size, uint64_t timecode,
int64_t pos) int64_t pos)
{ {
int a = st->codecpar->block_align; const int a = st->codecpar->block_align;
int sps = track->audio.sub_packet_size; const int sps = track->audio.sub_packet_size;
int cfs = track->audio.coded_framesize; const int cfs = track->audio.coded_framesize;
int h = track->audio.sub_packet_h; const int h = track->audio.sub_packet_h;
const int w = track->audio.frame_size;
int y = track->audio.sub_packet_cnt; int y = track->audio.sub_packet_cnt;
int w = track->audio.frame_size;
int x; int x;
if (!track->audio.pkt_cnt) { if (!track->audio.pkt_cnt) {
...@@ -3282,14 +3282,14 @@ static int matroska_parse_prores(MatroskaTrack *track, ...@@ -3282,14 +3282,14 @@ static int matroska_parse_prores(MatroskaTrack *track,
uint8_t *dst; uint8_t *dst;
int dstlen = *size + 8; int dstlen = *size + 8;
dst = av_malloc(dstlen + AV_INPUT_BUFFER_PADDING_SIZE); dst = av_malloc(dstlen + AV_INPUT_BUFFER_PADDING_SIZE);
if (!dst) if (!dst)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
AV_WB32(dst, dstlen); AV_WB32(dst, dstlen);
AV_WB32(dst + 4, MKBETAG('i', 'c', 'p', 'f')); AV_WB32(dst + 4, MKBETAG('i', 'c', 'p', 'f'));
memcpy(dst + 8, *data, dstlen - 8); memcpy(dst + 8, *data, dstlen - 8);
memset(dst + dstlen, 0, AV_INPUT_BUFFER_PADDING_SIZE); memset(dst + dstlen, 0, AV_INPUT_BUFFER_PADDING_SIZE);
*data = dst; *data = dst;
*size = dstlen; *size = dstlen;
......
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