Mercurial > libavformat.hg
changeset 4938:d7c5a47fe9c2 libavformat
remove unneeded length checks
| author | bcoudurier |
|---|---|
| date | Fri, 15 May 2009 04:43:44 +0000 |
| parents | 14cb663f11c3 |
| children | d10d934600db |
| files | mxfenc.c |
| diffstat | 1 files changed, 1 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mxfenc.c Thu May 14 21:05:52 2009 +0000 +++ b/mxfenc.c Fri May 15 04:43:44 2009 +0000 @@ -1308,7 +1308,7 @@ for(i = 0; i < pkt->size - 4; i++) { c = (c<<8) + pkt->data[i]; if (c == 0x1B5) { - if (i + 2 < pkt->size && (pkt->data[i+1] & 0xf0) == 0x10) { // seq ext + if ((pkt->data[i+1] & 0xf0) == 0x10) { // seq ext st->codec->profile = pkt->data[i+1] & 0x07; st->codec->level = pkt->data[i+2] >> 4; } else if (i + 5 < pkt->size && (pkt->data[i+1] & 0xf0) == 0x80) { // pict coding ext @@ -1316,7 +1316,6 @@ break; } } else if (c == 0x1b8) { // gop - if (i + 4 < pkt->size) { if (pkt->data[i+4]>>6 & 0x01) // closed *flags |= 0x80; // random access if (!mxf->header_written) { @@ -1334,10 +1333,8 @@ av_log(s, AV_LOG_DEBUG, "frame %d %d:%d:%d%c%d\n", mxf->timecode_start, hours, minutes, seconds, mxf->timecode_drop_frame ? ';':':', frames); } - } } else if (c == 0x1b3) { // seq *flags |= 0x40; - if (i + 4 < pkt->size) { switch ((pkt->data[i+4]>>4) & 0xf) { case 2: sc->aspect_ratio = (AVRational){ 4, 3}; break; case 3: sc->aspect_ratio = (AVRational){ 16, 9}; break; @@ -1346,7 +1343,6 @@ av_reduce(&sc->aspect_ratio.num, &sc->aspect_ratio.den, st->codec->width, st->codec->height, 1024*1024); } - } } else if (c == 0x100) { // pic int pict_type = (pkt->data[i+2]>>3) & 0x07; if (pict_type == 2) { // P frame