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 | |
| parent | b50ab3a4c7a1225862dcf0f0bd00ffef6acfdcbb (diff) | |
| parent | 46c1917350f58dfab84e41919e6c02d43950db8c (diff) | |
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>
| -rw-r--r-- | libavcodec/bgmc.c | 4 | ||||
| -rw-r--r-- | libavformat/nut.h | 2 | ||||
| -rw-r--r-- | libavformat/nutdec.c | 2 | ||||
| -rw-r--r-- | libavformat/nutenc.c | 2 |
4 files changed, 6 insertions, 4 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; diff --git a/libavformat/nut.h b/libavformat/nut.h index ab31c27429..c60eb35929 100644 --- a/libavformat/nut.h +++ b/libavformat/nut.h @@ -39,6 +39,8 @@ #define MAX_DISTANCE (1024*32-1) +#define NUT_VERSION 3 + typedef enum{ FLAG_KEY = 1, ///<if set, frame is keyframe FLAG_EOR = 2, ///<if set, stream has no relevance on presentation. (EOR) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index ea0fc1d53a..90f7ff86fa 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -226,7 +226,7 @@ static int decode_main_header(NUTContext *nut) end = get_packetheader(nut, bc, 1, MAIN_STARTCODE); end += avio_tell(bc); - GET_V(tmp, tmp >= 2 && tmp <= 3); + GET_V(tmp, tmp >= 2 && tmp <= NUT_VERSION); GET_V(stream_count, tmp > 0 && tmp <= NUT_MAX_STREAMS); nut->max_distance = ffio_read_varlen(bc); diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 2d8d2652ee..1947e32abf 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -335,7 +335,7 @@ static void write_mainheader(NUTContext *nut, AVIOContext *bc) tmp_head_idx; int64_t tmp_match; - ff_put_v(bc, 3); /* version */ + ff_put_v(bc, NUT_VERSION); ff_put_v(bc, nut->avf->nb_streams); ff_put_v(bc, nut->max_distance); ff_put_v(bc, nut->time_base_count); |