aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2011-11-10 17:30:33 +0100
committerJanne Grunau <janne-libav@jannau.net>2011-11-22 09:50:33 +0100
commit0945eddec09d1c2b69643afc70377d86febc0591 (patch)
tree97bcbf874a3b470c8426e869dc89cdd35b8a1422 /libavformat
parent82963f8f046bbe724e6c770a2aaf0290c9915503 (diff)
downloadffmpeg-0945eddec09d1c2b69643afc70377d86febc0591.tar.gz
pthread: do not touch has_b_frames
Adding the thread count in frame level multithreading to has_b_frames as an additional delay causes more problems than it solves. For example inconsistent behaviour during timestamp calculation in libavformat. Thread count and frame level multithreading are both set by the user. If the additional delay caused by frame level multithreading needs to be considered in the calling code it has all information to take it into account. Should it become necessary to calculate a maximum delay inside libavcodec it should be exported as its own field and not reusing an existing field. Based on a patch by Michael Niedermayer. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/utils.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index b8262ecaf1..2b378ab712 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -964,11 +964,6 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
delay= st->codec->has_b_frames;
presentation_delayed = 0;
- // ignore delay caused by frame threading so that the mpeg2-without-dts
- // warning will not trigger
- if (delay && st->codec->active_thread_type&FF_THREAD_FRAME)
- delay -= st->codec->thread_count-1;
-
/* XXX: need has_b_frame, but cannot get it if the codec is
not initialized */
if (delay &&