diff options
| author | Steve L'Homme <slhomme@divxcorp.com> | 2006-11-01 21:09:14 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-11-01 21:09:14 +0000 |
| commit | e344c1ea36f228e2987e25327638771c4cedcd33 (patch) | |
| tree | a455108c2e273a4791ef8cbd9b334160330121fe /libavformat | |
| parent | 484267f3d3d1d47c9a0541316b33beca5a36b2d1 (diff) | |
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
Originally committed as revision 6864 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avidec.c | 12 | ||||
| -rw-r--r-- | libavformat/movenc.c | 2 | ||||
| -rw-r--r-- | libavformat/rm.c | 4 | ||||
| -rw-r--r-- | libavformat/sierravmd.c | 8 | ||||
| -rw-r--r-- | libavformat/utils.c | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 6511595616..542c01b8ff 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -287,7 +287,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) 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 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) 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); diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 013005b0f0..dd1266303b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1341,7 +1341,7 @@ static int mov_write_moov_tag(ByteIOContext *pb, MOVContext *mov, 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); } diff --git a/libavformat/rm.c b/libavformat/rm.c index 1676023671..6ae996102a 100644 --- a/libavformat/rm.c +++ b/libavformat/rm.c @@ -547,8 +547,8 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVStream *st, 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")) { diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c index 308881aa9c..9d861d082a 100644 --- a/libavformat/sierravmd.c +++ b/libavformat/sierravmd.c @@ -302,10 +302,10 @@ static int vmd_read_packet(AVFormatContext *s, 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++; diff --git a/libavformat/utils.c b/libavformat/utils.c index 51badad0a4..e396cf545c 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1854,8 +1854,8 @@ int av_find_stream_info(AVFormatContext *ic) /* duplicate the packet */ if (av_dup_packet(pkt) < 0) { - ret = AVERROR_NOMEM; - break; + ret = AVERROR_NOMEM; + break; } read_size += pkt->size; |