From 46c1917350f58dfab84e41919e6c02d43950db8c Mon Sep 17 00:00:00 2001
From: Luca Barbato <lu_zero@gentoo.org>
Date: Sat, 4 May 2013 12:47:15 +0200
Subject: [PATCH] nut: use a define for the nut version
Ease switching version in the future and make evident why that value.
---
libavformat/nut.h | 2 ++
libavformat/nutdec.c | 2 +-
libavformat/nutenc.c | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavformat/nut.h b/libavformat/nut.h
index 89b0248fa43..8e5767d97de 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 cee411b6016..00c9ae36b7b 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -213,7 +213,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 df70f941221..7234cd9ee02 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -323,7 +323,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);
--
GitLab