Commit a73a203f authored by michael's avatar michael

muxer should now be spec compliant (though it likely still contains bugs!)


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@10052 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent a488c070
...@@ -216,7 +216,7 @@ static void put_packet(NUTContext *nut, ByteIOContext *bc, ByteIOContext *dyn_bc ...@@ -216,7 +216,7 @@ static void put_packet(NUTContext *nut, ByteIOContext *bc, ByteIOContext *dyn_bc
static void write_mainheader(NUTContext *nut, ByteIOContext *bc){ static void write_mainheader(NUTContext *nut, ByteIOContext *bc){
int i, j, tmp_pts, tmp_flags, tmp_stream, tmp_mul, tmp_size, tmp_fields; int i, j, tmp_pts, tmp_flags, tmp_stream, tmp_mul, tmp_size, tmp_fields;
put_v(bc, 2); /* version */ put_v(bc, 3); /* version */
put_v(bc, nut->avf->nb_streams); put_v(bc, nut->avf->nb_streams);
put_v(bc, MAX_DISTANCE); put_v(bc, MAX_DISTANCE);
put_v(bc, nut->time_base_count); put_v(bc, nut->time_base_count);
...@@ -375,10 +375,6 @@ static int write_header(AVFormatContext *s){ ...@@ -375,10 +375,6 @@ static int write_header(AVFormatContext *s){
ByteIOContext *bc = &s->pb; ByteIOContext *bc = &s->pb;
int i, j; int i, j;
if(s->streams[0]->codec->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL){
return -1;
}
nut->avf= s; nut->avf= s;
nut->stream = av_mallocz(sizeof(StreamContext)*s->nb_streams); nut->stream = av_mallocz(sizeof(StreamContext)*s->nb_streams);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment