diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-10-27 15:33:37 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-10-28 09:28:29 +0100 |
| commit | a1c5cc429d99216406170eac7e8352860076d3e8 (patch) | |
| tree | c25e4c0aa179054e6393ada7a8eade8c28a18825 | |
| parent | 2ba68dd044ca8fc591139c05563840f546a9c0c0 (diff) | |
| download | ffmpeg-a1c5cc429d99216406170eac7e8352860076d3e8.tar.gz | |
lavc: don't set AVFrame.pts to random numbers in decoders.
| -rw-r--r-- | libavcodec/h261dec.c | 1 | ||||
| -rw-r--r-- | libavcodec/ituh263dec.c | 1 | ||||
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 8 |
3 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index f88831f084..479da77958 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -476,7 +476,6 @@ static int h261_decode_picture_header(H261Context *h) s->picture_number = (s->picture_number & ~31) + i; s->avctx->time_base = (AVRational) { 1001, 30000 }; - s->current_picture.f.pts = s->picture_number; /* PTYPE starts here */ skip_bits1(&s->gb); /* split screen off */ diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 25dd4d90fb..2ddc2274a3 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -885,7 +885,6 @@ int ff_h263_decode_picture_header(MpegEncContext *s) i = get_bits(&s->gb, 8); /* picture timestamp */ if( (s->picture_number&~0xFF)+i < s->picture_number) i+= 256; - s->current_picture_ptr->f.pts = s->picture_number= (s->picture_number&~0xFF) + i; /* PTYPE starts here */ diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 2b486ce516..9a0b42b6f5 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1965,14 +1965,6 @@ static int decode_vop_header(MpegEncContext *s, GetBitContext *gb){ } } - if(s->avctx->time_base.num) - s->current_picture_ptr->f.pts = (s->time + s->avctx->time_base.num / 2) / s->avctx->time_base.num; - else - s->current_picture_ptr->f.pts = AV_NOPTS_VALUE; - if(s->avctx->debug&FF_DEBUG_PTS) - av_log(s->avctx, AV_LOG_DEBUG, "MPEG4 PTS: %"PRId64"\n", - s->current_picture_ptr->f.pts); - check_marker(gb, "before vop_coded"); /* vop coded */ |