diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 10:34:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 10:41:43 +0200 |
| commit | 77c85cbd9d4dd17c8b8966cec252f89351634d27 (patch) | |
| tree | 1ee8a96469252dfa400fa9479ee238d4c105401b /libavcodec/bgmc.c | |
| parent | b50ab3a4c7a1225862dcf0f0bd00ffef6acfdcbb (diff) | |
| parent | 46c1917350f58dfab84e41919e6c02d43950db8c (diff) | |
| download | ffmpeg-77c85cbd9d4dd17c8b8966cec252f89351634d27.tar.gz | |
Merge commit '46c1917350f58dfab84e41919e6c02d43950db8c'
* commit '46c1917350f58dfab84e41919e6c02d43950db8c':
nut: use a define for the nut version
bgmc: Do not mark ff_bgmc_decode_init() as av_cold
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bgmc.c')
| -rw-r--r-- | libavcodec/bgmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/bgmc.c b/libavcodec/bgmc.c index 82feda2a44..40e7d15dcc 100644 --- a/libavcodec/bgmc.c +++ b/libavcodec/bgmc.c @@ -485,8 +485,8 @@ av_cold void ff_bgmc_end(uint8_t **cf_lut, int **cf_lut_status) /** Initialize decoding and reads the first value */ -av_cold void ff_bgmc_decode_init(GetBitContext *gb, unsigned int *h, - unsigned int *l, unsigned int *v) +void ff_bgmc_decode_init(GetBitContext *gb, unsigned int *h, + unsigned int *l, unsigned int *v) { *h = TOP_VALUE; *l = 0; |