diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-09 18:32:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-10 05:19:58 +0100 |
| commit | 3cc1af9dd96f56aeedaf0d7e1553289c2bebf12b (patch) | |
| tree | 77dc8f4eee51cf081298dcd33fd4c527efe6d8dc /libavcodec | |
| parent | afc0a24d7d60f855676d8069011624d52361d7ed (diff) | |
| download | ffmpeg-3cc1af9dd96f56aeedaf0d7e1553289c2bebf12b.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/pthread.c | 1 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 4a44cea68f..04181e229f 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 9e827319a0..0c3e645bf7 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, \ |