Mercurial > libavformat.hg
changeset 1231:e713080a7880 libavformat
revert r5909, dont use non constant static variable, breaks multithreaded apps
| author | bcoudurier |
|---|---|
| date | Thu, 03 Aug 2006 15:33:48 +0000 |
| parents | fbd5d23dcefc |
| children | 3b4d01890ada |
| files | mxf.c |
| diffstat | 1 files changed, 1 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/mxf.c Thu Aug 03 12:31:15 2006 +0000 +++ b/mxf.c Thu Aug 03 15:33:48 2006 +0000 @@ -167,8 +167,6 @@ static const uint8_t mxf_header_partition_pack_key[] = { 0x06,0x0e,0x2b,0x34,0x02,0x05,0x01,0x01,0x0d,0x01,0x02,0x01,0x01,0x02 }; static const uint8_t mxf_essence_element_key[] = { 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01 }; -static offset_t mxf_header_offset = 0; - #define IS_KLV_KEY(x, y) (!memcmp(x, y, sizeof(y))) #define PRINT_KEY(x) dprintf("%02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n", \ @@ -886,11 +884,6 @@ KLVPacket klv; mxf->fc = s; - dprintf("header offset %llx\n", mxf_header_offset); - if (url_fseek(&s->pb, mxf_header_offset, SEEK_SET) < 0) { - av_log(s, AV_LOG_ERROR, "error seeking to header offset\n"); - return -1; - } while (!url_feof(&s->pb)) { const MXFMetadataReadTableEntry *function; @@ -961,10 +954,8 @@ /* Must skip Run-In Sequence and search for MXF header partition pack key SMPTE 377M 5.5 */ end -= sizeof(mxf_header_partition_pack_key); for (; bufp < end; bufp++) { - if (IS_KLV_KEY(bufp, mxf_header_partition_pack_key)) { - mxf_header_offset = bufp - p->buf; + if (IS_KLV_KEY(bufp, mxf_header_partition_pack_key)) return AVPROBE_SCORE_MAX; - } } return 0; }