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