diff options
| -rw-r--r-- | libavcodec/pthread.c | 4 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 5 |
3 files changed, 2 insertions, 9 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 42b82a57d7..9c3453f13d 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -363,8 +363,7 @@ static int update_context_from_thread(AVCodecContext *dst, AVCodecContext *src, } if (for_user) { - dst->coded_frame = src->coded_frame; - dst->has_b_frames += src->thread_count - 1; + dst->coded_frame = src->coded_frame; } else { if (dst->codec->update_thread_context) err = dst->codec->update_thread_context(dst, src); @@ -684,7 +683,6 @@ static void frame_thread_free(AVCodecContext *avctx, int thread_count) av_freep(&fctx->threads); pthread_mutex_destroy(&fctx->buffer_mutex); av_freep(&avctx->thread_opaque); - avctx->has_b_frames -= avctx->thread_count - 1; } static int frame_thread_init(AVCodecContext *avctx) diff --git a/libavcodec/version.h b/libavcodec/version.h index 35e8958c69..3f5c42e33e 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -21,7 +21,7 @@ #define AVCODEC_VERSION_H #define LIBAVCODEC_VERSION_MAJOR 53 -#define LIBAVCODEC_VERSION_MINOR 21 +#define LIBAVCODEC_VERSION_MINOR 22 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ 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 && |