Commit 9602a51e authored by diego's avatar diego

cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18022 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent d31f7c38
...@@ -348,20 +348,20 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -348,20 +348,20 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
get_buffer(pb, st->codec->extradata, st->codec->extradata_size); get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
} }
/* Extract palette from extradata if bpp <= 8 */ /* Extract palette from extradata if bpp <= 8 */
/* This code assumes that extradata contains only palette */ /* This code assumes that extradata contains only palette */
/* This is true for all paletted codecs implemented in ffmpeg */ /* This is true for all paletted codecs implemented in ffmpeg */
if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) { if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) {
st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl)); st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl));
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++) for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++)
st->codec->palctrl->palette[i] = bswap_32(((uint32_t*)st->codec->extradata)[i]); st->codec->palctrl->palette[i] = bswap_32(((uint32_t*)st->codec->extradata)[i]);
#else #else
memcpy(st->codec->palctrl->palette, st->codec->extradata, memcpy(st->codec->palctrl->palette, st->codec->extradata,
FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)); FFMIN(st->codec->extradata_size, AVPALETTE_SIZE));
#endif #endif
st->codec->palctrl->palette_changed = 1; st->codec->palctrl->palette_changed = 1;
} }
st->codec->codec_tag = tag1; st->codec->codec_tag = tag1;
st->codec->codec_id = codec_get_id(codec_bmp_tags, tag1); st->codec->codec_id = codec_get_id(codec_bmp_tags, tag1);
...@@ -398,21 +398,20 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -398,21 +398,20 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
// av_log(s, AV_LOG_ERROR, "flags: 0x%x stream id %d, bitrate %d\n", flags, stream_id, bitrate); // av_log(s, AV_LOG_ERROR, "flags: 0x%x stream id %d, bitrate %d\n", flags, stream_id, bitrate);
asf->stream_bitrates[stream_id]= bitrate; asf->stream_bitrates[stream_id]= bitrate;
} }
} else if (!memcmp(&g, &ff_asf_extended_content_header, sizeof(GUID))) { } else if (!memcmp(&g, &ff_asf_extended_content_header, sizeof(GUID))) {
int desc_count, i; int desc_count, i;
desc_count = get_le16(pb); desc_count = get_le16(pb);
for(i=0;i<desc_count;i++) for(i=0;i<desc_count;i++) {
{ int name_len,value_type,value_len;
int name_len,value_type,value_len; char name[1024];
char name[1024];
name_len = get_le16(pb);
name_len = get_le16(pb); get_str16_nolen(pb, name_len, name, sizeof(name));
get_str16_nolen(pb, name_len, name, sizeof(name)); value_type = get_le16(pb);
value_type = get_le16(pb); value_len = get_le16(pb);
value_len = get_le16(pb); get_tag(s, name, value_type, value_len);
get_tag(s, name, value_type, value_len); }
}
} else if (!memcmp(&g, &ff_asf_metadata_header, sizeof(GUID))) { } else if (!memcmp(&g, &ff_asf_metadata_header, sizeof(GUID))) {
int n, stream_num, name_len, value_len, value_type, value_num; int n, stream_num, name_len, value_len, value_type, value_num;
n = get_le16(pb); n = get_le16(pb);
......
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