diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 13:38:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 15:49:31 +0200 |
| commit | 17085a0251a1493f6447aa3d2ee06fda2c9402f0 (patch) | |
| tree | d627e3d5bdcf01ed711249c30247c74dd7087367 /libavcodec/pthread_frame.c | |
| parent | 51c810e62b63a1451b337b1cba0141b386066668 (diff) | |
| parent | 7ea1b3472a61de4aa4d41b571e99418e4997ad41 (diff) | |
Merge commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41'
* commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41':
lavc: deprecate the use of AVCodecContext.time_base for decoding
Conflicts:
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/mpegvideo_parser.c
libavcodec/utils.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pthread_frame.c')
| -rw-r--r-- | libavcodec/pthread_frame.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 1db46fcf96..e4f92d9dfd 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -198,6 +198,7 @@ static int update_context_from_thread(AVCodecContext *dst, AVCodecContext *src, if (dst != src) { dst->time_base = src->time_base; + dst->framerate = src->framerate; dst->width = src->width; dst->height = src->height; dst->pix_fmt = src->pix_fmt; |