ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Mar 14 23:30:16 2015 +0100| [a994fc39b3fc8b3996b24450916ec3ae69a00de5] | committer: Michael Niedermayer
avcodec/utils: mark codec argument as const in ff_lock_avcodec() Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a994fc39b3fc8b3996b24450916ec3ae69a00de5 --- libavcodec/internal.h | 2 +- libavcodec/utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 3d0cd5b..3bf35df 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 82f74d6..99f254b 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)) _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
