aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-14 23:30:16 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-14 23:33:31 +0100
commita994fc39b3fc8b3996b24450916ec3ae69a00de5 (patch)
tree0606d4bd21b69925098c516cb1d75bcda6d71e7b
parent43cafb956e29d690df6f4deb4c83508a2e066e58 (diff)
downloadffmpeg-a994fc39b3fc8b3996b24450916ec3ae69a00de5.tar.gz
avcodec/utils: mark codec argument as const in ff_lock_avcodec()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/internal.h2
-rw-r--r--libavcodec/utils.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index 3d0cd5b582..3bf35df3d6 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -167,7 +167,7 @@ int ff_init_buffer_info(AVCodecContext *s, AVFrame *frame);
void avpriv_color_frame(AVFrame *frame, const int color[4]);
extern volatile int ff_avcodec_locked;
-int ff_lock_avcodec(AVCodecContext *log_ctx, AVCodec *codec);
+int ff_lock_avcodec(AVCodecContext *log_ctx, const AVCodec *codec);
int ff_unlock_avcodec(void);
int avpriv_lock_avformat(void);
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 82f74d6df2..99f254b6b4 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -3604,7 +3604,7 @@ int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op))
return 0;
}
-int ff_lock_avcodec(AVCodecContext *log_ctx, AVCodec *codec)
+int ff_lock_avcodec(AVCodecContext *log_ctx, const AVCodec *codec)
{
if (lockmgr_cb) {
if ((*lockmgr_cb)(&codec_mutex, AV_LOCK_OBTAIN))