Mercurial > libavcodec.hg
comparison h264.c @ 4364:05e932ddaaa9 libavcodec
rename BE/LE_8/16/32 to AV_RL/B_8/16/32
| author | alex |
|---|---|
| date | Fri, 19 Jan 2007 22:12:59 +0000 |
| parents | 9b7662fa4905 |
| children | 9cebff821565 |
comparison
equal
deleted
inserted
replaced
| 4363:9b7662fa4905 | 4364:05e932ddaaa9 |
|---|---|
| 8213 h->nal_length_size = 2; | 8213 h->nal_length_size = 2; |
| 8214 // Decode sps from avcC | 8214 // Decode sps from avcC |
| 8215 cnt = *(p+5) & 0x1f; // Number of sps | 8215 cnt = *(p+5) & 0x1f; // Number of sps |
| 8216 p += 6; | 8216 p += 6; |
| 8217 for (i = 0; i < cnt; i++) { | 8217 for (i = 0; i < cnt; i++) { |
| 8218 nalsize = BE_16(p) + 2; | 8218 nalsize = AV_RB16(p) + 2; |
| 8219 if(decode_nal_units(h, p, nalsize) < 0) { | 8219 if(decode_nal_units(h, p, nalsize) < 0) { |
| 8220 av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i); | 8220 av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i); |
| 8221 return -1; | 8221 return -1; |
| 8222 } | 8222 } |
| 8223 p += nalsize; | 8223 p += nalsize; |
| 8224 } | 8224 } |
| 8225 // Decode pps from avcC | 8225 // Decode pps from avcC |
| 8226 cnt = *(p++); // Number of pps | 8226 cnt = *(p++); // Number of pps |
| 8227 for (i = 0; i < cnt; i++) { | 8227 for (i = 0; i < cnt; i++) { |
| 8228 nalsize = BE_16(p) + 2; | 8228 nalsize = AV_RB16(p) + 2; |
| 8229 if(decode_nal_units(h, p, nalsize) != nalsize) { | 8229 if(decode_nal_units(h, p, nalsize) != nalsize) { |
| 8230 av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i); | 8230 av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i); |
| 8231 return -1; | 8231 return -1; |
| 8232 } | 8232 } |
| 8233 p += nalsize; | 8233 p += nalsize; |