diff options
author | wm4 <nfxjfg@googlemail.com> | 2017-12-21 22:54:06 +0100 |
---|---|---|
committer | wm4 <nfxjfg@googlemail.com> | 2017-12-26 02:50:00 +0100 |
commit | 86a13bf2ffb40d44260d5747a4782a42a43a1ed8 (patch) | |
tree | cb6310c0db5956b5c8567cd9e99e6c2799ce90e0 /libavformat/avisynth.c | |
parent | e24f192a9fd6013e272df1bfaeaba31e8ca49f92 (diff) | |
download | ffmpeg-86a13bf2ffb40d44260d5747a4782a42a43a1ed8.tar.gz |
lavc, lavf: move avformat static mutex from avcodec to avformat
It's completely absurd that libavcodec would care about libavformat
locking, but it was there because the lock manager was in libavcodec.
This is more stright forward. Changes ABI, but we don't require ABI
compatibility currently.
Diffstat (limited to 'libavformat/avisynth.c')
-rw-r--r-- | libavformat/avisynth.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 56700288f7..250a489321 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -774,15 +774,15 @@ static av_cold int avisynth_read_header(AVFormatContext *s) int ret; // Calling library must implement a lock for thread-safe opens. - if (ret = avpriv_lock_avformat()) + if (ret = ff_lock_avformat()) return ret; if (ret = avisynth_open_file(s)) { - avpriv_unlock_avformat(); + ff_unlock_avformat(); return ret; } - avpriv_unlock_avformat(); + ff_unlock_avformat(); return 0; } @@ -818,11 +818,11 @@ static int avisynth_read_packet(AVFormatContext *s, AVPacket *pkt) static av_cold int avisynth_read_close(AVFormatContext *s) { - if (avpriv_lock_avformat()) + if (ff_lock_avformat()) return AVERROR_UNKNOWN; avisynth_context_destroy(s->priv_data); - avpriv_unlock_avformat(); + ff_unlock_avformat(); return 0; } |