diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-10-01 15:38:15 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-10-02 14:07:14 +0100 |
| commit | abaa12263e08ae7b2099f00fa4597ae6a86d7a9c (patch) | |
| tree | 292b847c83ddaad0920afbe93cb3e60a62c6276d /libavcodec/internal.h | |
| parent | 1d7d8244943cfbfce21049453f56e0d72f2c6d8a (diff) | |
avcodec: Don't lock during open if the codec has threadsafe init
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/internal.h')
| -rw-r--r-- | libavcodec/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 52b89172cb..324f0998af 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -182,7 +182,7 @@ void avpriv_color_frame(AVFrame *frame, const int color[4]); extern volatile int ff_avcodec_locked; int ff_lock_avcodec(AVCodecContext *log_ctx, const AVCodec *codec); -int ff_unlock_avcodec(void); +int ff_unlock_avcodec(const AVCodec *codec); int avpriv_lock_avformat(void); int avpriv_unlock_avformat(void); |