Mercurial > libavformat.hg
changeset 1441:ad3b03b7b142 libavformat
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
| author | diego |
|---|---|
| date | Wed, 01 Nov 2006 21:09:14 +0000 |
| parents | 7687091df65e |
| children | c2b748de9b35 |
| files | avidec.c movenc.c rm.c sierravmd.c utils.c |
| diffstat | 5 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/avidec.c Wed Nov 01 19:16:18 2006 +0000 +++ b/avidec.c Wed Nov 01 21:09:14 2006 +0000 @@ -287,7 +287,7 @@ tag1 = get_le32(pb); handler = get_le32(pb); /* codec tag */ #ifdef DEBUG - print_tag("strh", tag1, -1); + print_tag("strh", tag1, -1); #endif if(tag1 == MKTAG('i', 'a', 'v', 's') || tag1 == MKTAG('i', 'v', 'a', 's')){ /* @@ -399,11 +399,11 @@ get_le32(pb); /* ClrUsed */ get_le32(pb); /* ClrImportant */ - if(size > 10*4 && size<(1<<30)){ - st->codec->extradata_size= size - 10*4; - st->codec->extradata= av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); - get_buffer(pb, st->codec->extradata, st->codec->extradata_size); - } + if(size > 10*4 && size<(1<<30)){ + st->codec->extradata_size= size - 10*4; + st->codec->extradata= av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); + get_buffer(pb, st->codec->extradata, st->codec->extradata_size); + } if(st->codec->extradata_size & 1) //FIXME check if the encoder really did this correctly get_byte(pb);
--- a/movenc.c Wed Nov 01 19:16:18 2006 +0000 +++ b/movenc.c Wed Nov 01 21:09:14 2006 +0000 @@ -1341,7 +1341,7 @@ if (mov->mode == MODE_PSP) mov_write_uuidusmt_tag(pb, s); else - mov_write_udta_tag(pb, mov, s); + mov_write_udta_tag(pb, mov, s); return updateSize(pb, pos); }
--- a/rm.c Wed Nov 01 19:16:18 2006 +0000 +++ b/rm.c Wed Nov 01 21:09:14 2006 +0000 @@ -547,8 +547,8 @@ buf[3] = get_byte(pb); buf[4] = 0; } else { - get_str8(pb, buf, sizeof(buf)); /* desc */ - get_str8(pb, buf, sizeof(buf)); /* desc */ + get_str8(pb, buf, sizeof(buf)); /* desc */ + get_str8(pb, buf, sizeof(buf)); /* desc */ } st->codec->codec_type = CODEC_TYPE_AUDIO; if (!strcmp(buf, "dnet")) {
--- a/sierravmd.c Wed Nov 01 19:16:18 2006 +0000 +++ b/sierravmd.c Wed Nov 01 21:09:14 2006 +0000 @@ -302,10 +302,10 @@ pkt->data, pkt->size, vmd->audio_block_align); } -av_log(NULL, AV_LOG_INFO, " dispatching %s frame with %d bytes and pts %"PRId64" (%0.1f sec)\n", - (frame->frame_record[0] == 0x02) ? "video" : "audio", - frame->frame_size + BYTES_PER_FRAME_RECORD, - pkt->pts, (float)(pkt->pts / 90000.0)); + av_log(NULL, AV_LOG_INFO, " dispatching %s frame with %d bytes and pts %"PRId64" (%0.1f sec)\n", + (frame->frame_record[0] == 0x02) ? "video" : "audio", + frame->frame_size + BYTES_PER_FRAME_RECORD, + pkt->pts, (float)(pkt->pts / 90000.0)); vmd->current_frame++;