summaryrefslogtreecommitdiff
path: root/libavformat/chromaprint.c
diff options
context:
space:
mode:
authorwm4 <nfxjfg@googlemail.com>2017-12-21 22:54:06 +0100
committerwm4 <nfxjfg@googlemail.com>2017-12-26 02:50:00 +0100
commit86a13bf2ffb40d44260d5747a4782a42a43a1ed8 (patch)
treecb6310c0db5956b5c8567cd9e99e6c2799ce90e0 /libavformat/chromaprint.c
parente24f192a9fd6013e272df1bfaeaba31e8ca49f92 (diff)
downloadffmpeg-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/chromaprint.c')
-rw-r--r--libavformat/chromaprint.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/chromaprint.c b/libavformat/chromaprint.c
index 4da02bef76..f39c09ddb9 100644
--- a/libavformat/chromaprint.c
+++ b/libavformat/chromaprint.c
@@ -20,6 +20,7 @@
*/
#include "avformat.h"
+#include "internal.h"
#include "libavutil/opt.h"
#include "libavcodec/internal.h"
#include <chromaprint.h>
@@ -49,9 +50,9 @@ typedef struct ChromaprintMuxContext {
static void cleanup(ChromaprintMuxContext *cpr)
{
if (cpr->ctx) {
- avpriv_lock_avformat();
+ ff_lock_avformat();
chromaprint_free(cpr->ctx);
- avpriv_unlock_avformat();
+ ff_unlock_avformat();
}
}
@@ -60,9 +61,9 @@ static int write_header(AVFormatContext *s)
ChromaprintMuxContext *cpr = s->priv_data;
AVStream *st;
- avpriv_lock_avformat();
+ ff_lock_avformat();
cpr->ctx = chromaprint_new(cpr->algorithm);
- avpriv_unlock_avformat();
+ ff_unlock_avformat();
if (!cpr->ctx) {
av_log(s, AV_LOG_ERROR, "Failed to create chromaprint context.\n");