Merge commit '380146924ecad2e05e9dcc5c3c2e1b5ba47c51e8'

[ffmpeg] / libavcodec / internal.h

diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index 89f5aa2715d125a182555c7e38548f18b150b59a..324f0998af4b4bbce5a2d49ad68b2307b994eb46 100644 (file)
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -57,7 +57,7 @@
 #ifdef TRACE
 #   define ff_tlog(ctx, ...) av_log(ctx, AV_LOG_TRACE, __VA_ARGS__)
 #else
-#   define ff_tlog(ctx, ...) while(0)
+#   define ff_tlog(ctx, ...) do {} while(0)
 #endif
 
 
@@ -182,7 +182,7 @@ void avpriv_color_frame(AVFrame *frame, const int color[4]);
 
 extern volatile int ff_avcodec_locked;
 int ff_lock_avcodec(AVCodecContext *log_ctx, const AVCodec *codec);
-int ff_unlock_avcodec(void);
+int ff_unlock_avcodec(const AVCodec *codec);
 
 int avpriv_lock_avformat(void);
 int avpriv_unlock_avformat(void);