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 /libavformat/nutdec.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 'libavformat/nutdec.c')
| -rw-r--r-- | libavformat/nutdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |