diff options
author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-04-04 09:55:31 +0000 |
---|---|---|
committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-04-04 09:55:31 +0000 |
commit | b64518e91b41354780cf907fad0f948f14d5ff93 (patch) | |
tree | 43abde3d1f6a7fe29771ed49b09d84afb5adcb89 /libavformat/movenc.c | |
parent | 39e9e6d94091d8d0497230827f89f731c4ef75da (diff) | |
download | ffmpeg-streaming-b64518e91b41354780cf907fad0f948f14d5ff93.zip ffmpeg-streaming-b64518e91b41354780cf907fad0f948f14d5ff93.tar.gz |
special mpeg2 handling is no more needed
Originally committed as revision 12685 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/movenc.c')
-rw-r--r-- | libavformat/movenc.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 3463ac6..738b97f 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -616,8 +616,7 @@ static int mov_write_video_tag(ByteIOContext *pb, MOVTrack* track) 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 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt) 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 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt) 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 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt) 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); |