Mercurial > libavformat.hg
comparison iff.c @ 5985:35c3858d457f libavformat
Reindent after rr22977.
Patch by Sebastian Vater <cdgs.basty googlemail com>.
| author | rbultje |
|---|---|
| date | Tue, 27 Apr 2010 14:04:11 +0000 |
| parents | 55c714a8fb00 |
| children | 672248acc077 |
comparison
equal
deleted
inserted
replaced
| 5984:55c714a8fb00 | 5985:35c3858d457f |
|---|---|
| 112 int compression = -1; | 112 int compression = -1; |
| 113 char *buf; | 113 char *buf; |
| 114 | 114 |
| 115 st = av_new_stream(s, 0); | 115 st = av_new_stream(s, 0); |
| 116 if (!st) | 116 if (!st) |
| 117 return AVERROR(ENOMEM); | 117 return AVERROR(ENOMEM); |
| 118 | 118 |
| 119 st->codec->channels = 1; | 119 st->codec->channels = 1; |
| 120 url_fskip(pb, 8); | 120 url_fskip(pb, 8); |
| 121 // codec_tag used by ByteRun1 decoder to distinguish progressive (PBM) and interlaced (ILBM) content | 121 // codec_tag used by ByteRun1 decoder to distinguish progressive (PBM) and interlaced (ILBM) content |
| 122 st->codec->codec_tag = get_le32(pb); | 122 st->codec->codec_tag = get_le32(pb); |
| 134 if (data_size < 14) | 134 if (data_size < 14) |
| 135 return AVERROR_INVALIDDATA; | 135 return AVERROR_INVALIDDATA; |
| 136 url_fskip(pb, 12); | 136 url_fskip(pb, 12); |
| 137 st->codec->sample_rate = get_be16(pb); | 137 st->codec->sample_rate = get_be16(pb); |
| 138 if (data_size >= 16) { | 138 if (data_size >= 16) { |
| 139 url_fskip(pb, 1); | 139 url_fskip(pb, 1); |
| 140 compression = get_byte(pb); | 140 compression = get_byte(pb); |
| 141 } | 141 } |
| 142 break; | 142 break; |
| 143 | 143 |
| 144 case ID_BODY: | 144 case ID_BODY: |
| 145 iff->body_pos = url_ftell(pb); | 145 iff->body_pos = url_ftell(pb); |
| 168 st->codec->width = get_be16(pb); | 168 st->codec->width = get_be16(pb); |
| 169 st->codec->height = get_be16(pb); | 169 st->codec->height = get_be16(pb); |
| 170 url_fskip(pb, 4); // x, y offset | 170 url_fskip(pb, 4); // x, y offset |
| 171 st->codec->bits_per_coded_sample = get_byte(pb); | 171 st->codec->bits_per_coded_sample = get_byte(pb); |
| 172 if (data_size >= 11) { | 172 if (data_size >= 11) { |
| 173 url_fskip(pb, 1); // masking | 173 url_fskip(pb, 1); // masking |
| 174 compression = get_byte(pb); | 174 compression = get_byte(pb); |
| 175 } | 175 } |
| 176 if (data_size >= 16) { | 176 if (data_size >= 16) { |
| 177 url_fskip(pb, 3); // paddding, transparent | 177 url_fskip(pb, 3); // paddding, transparent |
| 178 st->sample_aspect_ratio.num = get_byte(pb); | 178 st->sample_aspect_ratio.num = get_byte(pb); |
| 179 st->sample_aspect_ratio.den = get_byte(pb); | 179 st->sample_aspect_ratio.den = get_byte(pb); |
| 180 } | 180 } |
| 181 break; | 181 break; |
| 182 | 182 |
| 183 case ID_ANNO: | 183 case ID_ANNO: |
| 184 buf = av_malloc(data_size + 1); | 184 buf = av_malloc(data_size + 1); |