aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-09 17:26:19 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-09 17:47:10 +0100
commit26ae9a5d7c448a3eb42641b546ee8d585ab716e6 (patch)
tree7a8283b64eeea55ce979160270543824ba5cadc6 /libavformat/utils.c
parent367468f1482541d1e17ce3fdf1d496746a2de21b (diff)
downloadffmpeg-26ae9a5d7c448a3eb42641b546ee8d585ab716e6.tar.gz
pthreads: drop has_b_frames mangling, its buggy in many many ways,
not to mention race conditions and that its used for stream copy, used to determine IPB type by applications and other things. Fixes various frame drop/timestamp issues with frame multithreading. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 1d84cc6710..c7916dc407 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1004,11 +1004,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 &&