Commit 21732063 authored by Martin Storsjö's avatar Martin Storsjö

movenc: K&R formatting cosmetics

Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent 38e9585d
This diff is collapsed.
...@@ -87,7 +87,7 @@ static void sample_queue_free(HintSampleQueue *queue) ...@@ -87,7 +87,7 @@ static void sample_queue_free(HintSampleQueue *queue)
if (queue->samples[i].own_data) if (queue->samples[i].own_data)
av_free(queue->samples[i].data); av_free(queue->samples[i].data);
av_freep(&queue->samples); av_freep(&queue->samples);
queue->len = 0; queue->len = 0;
queue->size = 0; queue->size = 0;
} }
...@@ -104,7 +104,7 @@ static void sample_queue_push(HintSampleQueue *queue, uint8_t *data, int size, ...@@ -104,7 +104,7 @@ static void sample_queue_push(HintSampleQueue *queue, uint8_t *data, int size,
if (size <= 14) if (size <= 14)
return; return;
if (!queue->samples || queue->len >= queue->size) { if (!queue->samples || queue->len >= queue->size) {
HintSample* samples; HintSample *samples;
queue->size += 10; queue->size += 10;
samples = av_realloc(queue->samples, sizeof(HintSample)*queue->size); samples = av_realloc(queue->samples, sizeof(HintSample)*queue->size);
if (!samples) if (!samples)
...@@ -114,7 +114,7 @@ static void sample_queue_push(HintSampleQueue *queue, uint8_t *data, int size, ...@@ -114,7 +114,7 @@ static void sample_queue_push(HintSampleQueue *queue, uint8_t *data, int size,
queue->samples[queue->len].data = data; queue->samples[queue->len].data = data;
queue->samples[queue->len].size = size; queue->samples[queue->len].size = size;
queue->samples[queue->len].sample_number = sample; queue->samples[queue->len].sample_number = sample;
queue->samples[queue->len].offset = 0; queue->samples[queue->len].offset = 0;
queue->samples[queue->len].own_data = 0; queue->samples[queue->len].own_data = 0;
queue->len++; queue->len++;
} }
...@@ -128,7 +128,7 @@ static void sample_queue_retain(HintSampleQueue *queue) ...@@ -128,7 +128,7 @@ static void sample_queue_retain(HintSampleQueue *queue)
for (i = 0; i < queue->len; ) { for (i = 0; i < queue->len; ) {
HintSample *sample = &queue->samples[i]; HintSample *sample = &queue->samples[i];
if (!sample->own_data) { if (!sample->own_data) {
uint8_t* ptr = av_malloc(sample->size); uint8_t *ptr = av_malloc(sample->size);
if (!ptr) { if (!ptr) {
/* Unable to allocate memory for this one, remove it */ /* Unable to allocate memory for this one, remove it */
memmove(queue->samples + i, queue->samples + i + 1, memmove(queue->samples + i, queue->samples + i + 1,
...@@ -344,7 +344,7 @@ static int write_hint_packets(AVIOContext *out, const uint8_t *data, ...@@ -344,7 +344,7 @@ static int write_hint_packets(AVIOContext *out, const uint8_t *data,
trk->max_packet_size = packet_len; trk->max_packet_size = packet_len;
seq = AV_RB16(&data[2]); seq = AV_RB16(&data[2]);
ts = AV_RB32(&data[4]); ts = AV_RB32(&data[4]);
if (trk->prev_rtp_ts == 0) if (trk->prev_rtp_ts == 0)
trk->prev_rtp_ts = ts; trk->prev_rtp_ts = ts;
...@@ -417,7 +417,7 @@ int ff_mov_add_hinted_packet(AVFormatContext *s, AVPacket *pkt, ...@@ -417,7 +417,7 @@ int ff_mov_add_hinted_packet(AVFormatContext *s, AVPacket *pkt,
* for next time. */ * for next time. */
size = avio_close_dyn_buf(rtp_ctx->pb, &buf); size = avio_close_dyn_buf(rtp_ctx->pb, &buf);
if ((ret = ffio_open_dyn_packet_buf(&rtp_ctx->pb, if ((ret = ffio_open_dyn_packet_buf(&rtp_ctx->pb,
RTP_MAX_PACKET_SIZE)) < 0) RTP_MAX_PACKET_SIZE)) < 0)
goto done; goto done;
if (size <= 0) if (size <= 0)
...@@ -445,8 +445,9 @@ done: ...@@ -445,8 +445,9 @@ done:
return ret; return ret;
} }
void ff_mov_close_hinting(MOVTrack *track) { void ff_mov_close_hinting(MOVTrack *track)
AVFormatContext* rtp_ctx = track->rtp_ctx; {
AVFormatContext *rtp_ctx = track->rtp_ctx;
uint8_t *ptr; uint8_t *ptr;
av_freep(&track->enc); av_freep(&track->enc);
......
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