diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2004-04-07 14:00:16 +0000 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2004-04-07 14:00:16 +0000 |
| commit | 21f52609dd770bcd5dd37cee5c9a7d6ea09842f9 (patch) | |
| tree | a2c250f67448d8f47e4b714d46c7c3e8c2f557c1 | |
| parent | 00a3c8b8a9a487727dd4e5f82d4095330863107e (diff) | |
| download | ffmpeg-21f52609dd770bcd5dd37cee5c9a7d6ea09842f9.tar.gz | |
support for -timestamp
Originally committed as revision 2978 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/movenc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 7cc77e8823..2b9c7b32eb 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -949,10 +949,6 @@ static int mov_write_header(AVFormatContext *s) return 0; } -static int Timestamp(void) { - return 1067949799U+(24107*86400); //its the modification time of this line :) -} - static int mov_write_packet(AVFormatContext *s, int stream_index, const uint8_t *buf, int size, int64_t pts) { @@ -994,7 +990,7 @@ static int mov_write_packet(AVFormatContext *s, int stream_index, if ((enc->codec_id == CODEC_ID_MPEG4 || enc->codec_id == CODEC_ID_AAC) && trk->vosLen == 0) { - assert(enc->extradata_size); +// assert(enc->extradata_size); trk->vosLen = enc->extradata_size; trk->vosData = av_malloc(trk->vosLen); @@ -1016,7 +1012,7 @@ static int mov_write_packet(AVFormatContext *s, int stream_index, if (mov->mdat_written == 0) { mov_write_mdat_tag(pb, mov); mov->mdat_written = 1; - mov->time = Timestamp(); + mov->time = s->timestamp; } trk->cluster[cl][id].pos = url_ftell(pb); |