diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-20 22:24:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-20 22:24:43 +0100 |
| commit | 0a1146a59a1c0a97e879cd2683b01db59d9a5144 (patch) | |
| tree | a8ab1ed80553f286eed21e5a960745b8ef513c8e | |
| parent | 7b7f8d3ed03d5d8f6c042644bf82a86ae2f996e4 (diff) | |
| parent | b8d18a94376c44dac9523dc3317259a30fc92f8b (diff) | |
| download | ffmpeg-0a1146a59a1c0a97e879cd2683b01db59d9a5144.tar.gz | |
Merge commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b'
* commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b':
libavcodec: Don't use av_cold annotation in twinvq header file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/twinvq.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/twinvq.h b/libavcodec/twinvq.h index ae0f595d3c..206eeaaf83 100644 --- 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 */ |