diff options
author | wm4 <nfxjfg@googlemail.com> | 2017-12-21 22:43:43 +0100 |
---|---|---|
committer | wm4 <nfxjfg@googlemail.com> | 2017-12-26 02:50:00 +0100 |
commit | e24f192a9fd6013e272df1bfaeaba31e8ca49f92 (patch) | |
tree | b5fc1bcc47640777e3ceb5b9d0bbdea3204fb71b /fftools | |
parent | a04c2c707de2ce850f79870e84ac9d7ec7aa9143 (diff) | |
download | ffmpeg-e24f192a9fd6013e272df1bfaeaba31e8ca49f92.tar.gz |
ffplay: drop lock manager use
Deprecated and useless.
Diffstat (limited to 'fftools')
-rw-r--r-- | fftools/ffplay.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 10a917194d..9bfa3e6cea 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -1284,7 +1284,6 @@ static void do_exit(VideoState *is) SDL_DestroyRenderer(renderer); if (window) SDL_DestroyWindow(window); - av_lockmgr_register(NULL); uninit_opts(); #if CONFIG_AVFILTER av_freep(&vfilters_list); @@ -3641,27 +3640,6 @@ void show_help_default(const char *opt, const char *arg) ); } -static int lockmgr(void **mtx, enum AVLockOp op) -{ - switch(op) { - case AV_LOCK_CREATE: - *mtx = SDL_CreateMutex(); - if(!*mtx) { - av_log(NULL, AV_LOG_FATAL, "SDL_CreateMutex(): %s\n", SDL_GetError()); - return 1; - } - return 0; - case AV_LOCK_OBTAIN: - return !!SDL_LockMutex(*mtx); - case AV_LOCK_RELEASE: - return !!SDL_UnlockMutex(*mtx); - case AV_LOCK_DESTROY: - SDL_DestroyMutex(*mtx); - return 0; - } - return 1; -} - /* Called from the main */ int main(int argc, char **argv) { @@ -3723,11 +3701,6 @@ int main(int argc, char **argv) SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE); SDL_EventState(SDL_USEREVENT, SDL_IGNORE); - if (av_lockmgr_register(lockmgr)) { - av_log(NULL, AV_LOG_FATAL, "Could not initialize lock manager!\n"); - do_exit(NULL); - } - av_init_packet(&flush_pkt); flush_pkt.data = (uint8_t *)&flush_pkt; |