Mercurial > libavformat.hg
changeset 3203:e5991c49acdc libavformat
special mpeg2 handling is no more needed
| author | bcoudurier |
|---|---|
| date | Fri, 04 Apr 2008 09:55:31 +0000 |
| parents | 98e633b72d38 |
| children | bf14268f0f59 |
| files | movenc.c |
| diffstat | 1 files changed, 1 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/movenc.c Thu Apr 03 22:15:16 2008 +0000 +++ b/movenc.c Fri Apr 04 09:55:31 2008 +0000 @@ -616,8 +616,7 @@ mov_write_avcc_tag(pb, track); if(track->mode == MODE_IPOD) mov_write_uuid_tag_ipod(pb); - } else if(track->vosLen > 0 && - track->enc->codec_id != CODEC_ID_MPEG2VIDEO) + } else if(track->vosLen > 0) mov_write_glbl_tag(pb, track); return updateSize (pb, pos); @@ -1537,7 +1536,6 @@ AVCodecContext *enc = trk->enc; unsigned int samplesInChunk = 0; int size= pkt->size; - int dump_extradata = 0; if (url_is_streamed(s->pb)) return 0; /* Can't handle that */ if (!size) return 0; /* Discard 0 sized packets */ @@ -1583,11 +1581,6 @@ trk->vosLen = 640; trk->vosData = av_malloc(trk->vosLen); memcpy(trk->vosData, pkt->data, 640); - } else if (enc->codec_id == CODEC_ID_MPEG2VIDEO && trk->vosLen > 4 && - AV_RB32(trk->vosData) == 0x000001b3 && pkt->flags & PKT_FLAG_KEY && - pkt->size > 4 && AV_RB32(pkt->data) != 0x000001b3) { - size += trk->vosLen; - dump_extradata = 1; } if (!(trk->entry % MOV_INDEX_CLUSTER_SIZE)) { @@ -1615,10 +1608,6 @@ trk->sampleCount += samplesInChunk; mov->mdat_size += size; - if (dump_extradata) { - put_buffer(pb, trk->vosData, trk->vosLen); - size -= trk->vosLen; - } put_buffer(pb, pkt->data, size); put_flush_packet(pb);