generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12'

Browse Source 
* commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12':
  pthread: store thread contexts in AVCodecInternal instead of AVCodecContext

Conflicts:
	libavcodec/internal.h
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-11-04 11:14:38 +01:00
parent 2a7cbc29a8 38ecc3702d
commit 3fc26d8073
7 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/utils.c
View File

@@ -2558,7 +2558,7 @@ av_cold int avcodec_close(AVCodecContext *avctx)
ff_frame_thread_encoder_free(avctx);
ff_lock_avcodec(avctx);
}
if (HAVE_THREADS && avctx->thread_opaque)
if (HAVE_THREADS && avctx->internal->thread_ctx)
ff_thread_free(avctx);
if (avctx->codec && avctx->codec->close)
avctx->codec->close(avctx);