Merge commit 'b8d18a94'

* commit 'b8d18a94':
  libavcodec: Don't use av_cold annotation in twinvq header file
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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 */