Mercurial > libavformat.hg
comparison avidec.c @ 1441:ad3b03b7b142 libavformat
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
| author | diego |
|---|---|
| date | Wed, 01 Nov 2006 21:09:14 +0000 |
| parents | 3b00fb8ef8e4 |
| children | 404048ea11bc |
comparison
equal
deleted
inserted
replaced
| 1440:7687091df65e | 1441:ad3b03b7b142 |
|---|---|
| 285 /* stream header */ | 285 /* stream header */ |
| 286 stream_index++; | 286 stream_index++; |
| 287 tag1 = get_le32(pb); | 287 tag1 = get_le32(pb); |
| 288 handler = get_le32(pb); /* codec tag */ | 288 handler = get_le32(pb); /* codec tag */ |
| 289 #ifdef DEBUG | 289 #ifdef DEBUG |
| 290 print_tag("strh", tag1, -1); | 290 print_tag("strh", tag1, -1); |
| 291 #endif | 291 #endif |
| 292 if(tag1 == MKTAG('i', 'a', 'v', 's') || tag1 == MKTAG('i', 'v', 'a', 's')){ | 292 if(tag1 == MKTAG('i', 'a', 'v', 's') || tag1 == MKTAG('i', 'v', 'a', 's')){ |
| 293 /* | 293 /* |
| 294 * After some consideration -- I don't think we | 294 * After some consideration -- I don't think we |
| 295 * have to support anything but DV in a type1 AVIs. | 295 * have to support anything but DV in a type1 AVIs. |
| 397 get_le32(pb); /* XPelsPerMeter */ | 397 get_le32(pb); /* XPelsPerMeter */ |
| 398 get_le32(pb); /* YPelsPerMeter */ | 398 get_le32(pb); /* YPelsPerMeter */ |
| 399 get_le32(pb); /* ClrUsed */ | 399 get_le32(pb); /* ClrUsed */ |
| 400 get_le32(pb); /* ClrImportant */ | 400 get_le32(pb); /* ClrImportant */ |
| 401 | 401 |
| 402 if(size > 10*4 && size<(1<<30)){ | 402 if(size > 10*4 && size<(1<<30)){ |
| 403 st->codec->extradata_size= size - 10*4; | 403 st->codec->extradata_size= size - 10*4; |
| 404 st->codec->extradata= av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); | 404 st->codec->extradata= av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); |
| 405 get_buffer(pb, st->codec->extradata, st->codec->extradata_size); | 405 get_buffer(pb, st->codec->extradata, st->codec->extradata_size); |
| 406 } | 406 } |
| 407 | 407 |
| 408 if(st->codec->extradata_size & 1) //FIXME check if the encoder really did this correctly | 408 if(st->codec->extradata_size & 1) //FIXME check if the encoder really did this correctly |
| 409 get_byte(pb); | 409 get_byte(pb); |
| 410 | 410 |
| 411 /* Extract palette from extradata if bpp <= 8 */ | 411 /* Extract palette from extradata if bpp <= 8 */ |