[FFmpeg-cvslog] pthreads: export the delay that was previously exported by mangling has_b_frames through
Michael Niedermayer
git at videolan.org
Thu Nov 10 05:36:18 CET 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov 9 18:32:38 2011 +0100| [3cc1af9dd96f56aeedaf0d7e1553289c2bebf12b] | committer: Michael Niedermayer
pthreads: export the delay that was previously exported by mangling has_b_frames through
AVCodecContext.delay which was previously unused for decoders and fits better.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3cc1af9dd96f56aeedaf0d7e1553289c2bebf12b
---
libavcodec/pthread.c | 1 +
libavcodec/version.h | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 4a44cea..04181e2 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -363,6 +363,7 @@ static int update_context_from_thread(AVCodecContext *dst, AVCodecContext *src,
}
if (for_user) {
+ dst->delay = src->thread_count - 1;
dst->coded_frame = src->coded_frame;
} else {
if (dst->codec->update_thread_context)
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 9e82731..0c3e645 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 30
+#define LIBAVCODEC_VERSION_MINOR 31
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
More information about the ffmpeg-cvslog
mailing list