diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 14:32:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 14:32:55 +0100 |
| commit | 2fc662ae63ab79234f7c2996ad4e5c1993f85a18 (patch) | |
| tree | 1d4d3299b037c1b12046ec68a41926da8412deea /libavcodec/mss12.h | |
| parent | 5ecf8189c682f41ab315e171e0e7721d7e272138 (diff) | |
| parent | 040c565e51985477a8fa5e42d2ddfb26ebde6608 (diff) | |
Merge commit '040c565e51985477a8fa5e42d2ddfb26ebde6608'
* commit '040c565e51985477a8fa5e42d2ddfb26ebde6608':
doc: developer: Allow tabs in the vim configuration for Automake files
Remove pointless av_cold attributes in header files
Conflicts:
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mss12.h')
| -rw-r--r-- | libavcodec/mss12.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mss12.h b/libavcodec/mss12.h index 42ceab568f..a3f9a7ca70 100644 --- a/libavcodec/mss12.h +++ b/libavcodec/mss12.h @@ -95,9 +95,9 @@ int ff_mss12_decode_rect(SliceContext *ctx, ArithCoder *acoder, int x, int y, int width, int height); void ff_mss12_model_update(Model *m, int val); void ff_mss12_slicecontext_reset(SliceContext *sc); -av_cold int ff_mss12_decode_init(MSS12Context *c, int version, - SliceContext* sc1, SliceContext *sc2); -av_cold int ff_mss12_decode_end(MSS12Context *ctx); +int ff_mss12_decode_init(MSS12Context *c, int version, + SliceContext *sc1, SliceContext *sc2); +int ff_mss12_decode_end(MSS12Context *ctx); #define ARITH_GET_BIT(VERSION) \ static int arith ## VERSION ## _get_bit(ArithCoder *c) \ |