[Mplayer-cvslog] CVS: main/DOCS/tech mncf.txt,1.64,1.65

[Michael Niedermayer CVS]

CVS change done by Michael Niedermayer CVS

Update of /cvsroot/mplayer/main/DOCS/tech
In directory mail:/var2/tmp/cvs-serv12618

Modified Files:
	mncf.txt 
Log Message:
remove non native codec specific data
move lang to the info packet


Index: mncf.txt
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/tech/mncf.txt,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- mncf.txt	18 Aug 2004 19:00:05 -0000	1.64
+++ mncf.txt	5 Oct 2004 12:04:56 -0000	1.65
@@ -1,4 +1,4 @@
-		NUT Open Container Format DRAFT 20040409
+	NUT Open Container Format DRAFT 20041005 (Michael's experimental fork)
 		----------------------------------------
 
 
@@ -127,18 +127,13 @@
 	stream_class				v
 	fourcc					vb
 	average_bitrate				v
-	language_code				vb
 	time_base_nom				v
 	time_base_denom				v
 	msb_timestamp_shift			v
 	decode_delay				v
 	fixed_fps				u(1)
 	reserved				u(6)
-	for(;;){
-		codec_specific_data_type	v
-		if(codec_specific_data_type==0) break;
-		codec_specific_data		vb
-	}
+	codec_specific_data			vb
 
 video_stream_header:
 	stream_header
@@ -303,13 +298,6 @@
 	example: "H264"
 	MUST contain 2 or 4 bytes, note, this might be increased in the future
 	if needed
-      
-language_code 
-	ISO 639 and ISO 3166 for language/country code
-	something like "usen" (US english), can be 0
-	if unknown
-	see http://www.loc.gov/standards/iso639-2/englangn.html
-	and http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/en_listp1.html
 
 time_base_nom / time_base_denom = time_base
 	the number of timer ticks per second, this MUST be equal to the fps
@@ -360,16 +348,6 @@
 fixed_fps
 	1 indicates that the fps is fixed
 
-codec_specific_data_type
-	0	none/end
-	1	native
-	2	bitmapinfoheader
-	3	waveformatex
-	4	imagedesc
-	5	sounddesc
-	"native", means a simple api & container independanet storage form,
-	for example some mpeg4-es headers
-        
 codec_specific_data
 	private global data for a codec (could be huffman tables or ...)
 
@@ -502,6 +480,11 @@
 			Note: dont forget the timezone
 	"ReplayGain"
 	"Keywords"
+	"Language"	ISO 639 and ISO 3166 for language/country code
+			something like "usen" (US english), can be 0 if unknown
+			and "multi" if several languages
+			see http://www.loc.gov/standards/iso639-2/englangn.html
+			and http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/en_listp1.htmlthe language code
 	"Disposition"	"original", "dub" (translated), "comment", "lyrics", "karaoke"
 	Note: if someone needs some others, please tell us about them, so we can
 	      add them to the official standard (if they are sane)
@@ -527,6 +510,7 @@
 	{"EndTimestamp"		, "v"},
 	{"Author"		, "UTF8"},
 	{"Titel"		, "UTF8"},
+	{"Language"		, "UTF8"},
 	{"Description"		, "UTF8"},
 	{"Copyright"		, "UTF8"},
 	{"Encoder"		, "UTF8"},