From a1c5cc429d99216406170eac7e8352860076d3e8 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Sun, 27 Oct 2013 15:33:37 +0100
Subject: [PATCH] lavc: don't set AVFrame.pts to random numbers in decoders.
---
libavcodec/h261dec.c | 1 -
libavcodec/ituh263dec.c | 1 -
libavcodec/mpeg4videodec.c | 8 --------
3 files changed, 10 deletions(-)
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c
index f88831f084f..479da779581 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 25dd4d90fb1..2ddc2274a3b 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 2b486ce516d..9a0b42b6f55 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 */
--
GitLab