Merge commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b'

* commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b': libavcodec: Don't use av_cold annotation in twinvq header file Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 0a1146a59a
parent 7b7f8d3ed0 b8d18a9437
commit 0a1146a59a
1 changed files with 2 additions and 2 deletions
--- a/libavcodec/twinvq.h
+++ b/libavcodec/twinvq.h
@ -197,7 +197,7 @@ static inline float twinvq_mulawinv(float y, float clip, float mu)

 int ff_twinvq_decode_frame(AVCodecContext *avctx, void *data,
                           int *got_frame_ptr, AVPacket *avpkt);
-av_cold int ff_twinvq_decode_close(AVCodecContext *avctx);
-av_cold int ff_twinvq_decode_init(AVCodecContext *avctx);
+int ff_twinvq_decode_close(AVCodecContext *avctx);
+int ff_twinvq_decode_init(AVCodecContext *avctx);

 #endif /* AVCODEC_TWINVQ_DATA_H */