[Ffmpeg-cvslog] CVS: ffmpeg/libavformat avienc.c,1.119,1.120

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv18286/libavformat

Modified Files:
	avienc.c 
Log Message:
avoid using non constant fields of AVCodecContext in avi muxer


Index: avienc.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avienc.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- avienc.c	12 Jan 2006 22:43:22 -0000	1.119
+++ avienc.c	25 Jan 2006 17:14:16 -0000	1.120
@@ -613,8 +613,8 @@
                 url_fseek(pb, avi->frames_hdr_strm[n], SEEK_SET);
                 ff_parse_specific_params(stream, &au_byterate, &au_ssize, &au_scale);
                 if (au_ssize == 0) {
-                    put_le32(pb, stream->frame_number);
-                    nb_frames += stream->frame_number;
+                    put_le32(pb, avi->packet_count[n]);
+                    nb_frames += avi->packet_count[n];
                 } else {
                     put_le32(pb, avi->audio_strm_length[n] / au_ssize);
                 }
@@ -730,11 +730,11 @@
         for (n=nb_frames=0;n<s->nb_streams;n++) {
              AVCodecContext *stream = s->streams[n]->codec;
              if (stream->codec_type == CODEC_TYPE_VIDEO) {
-                 if (nb_frames < stream->frame_number)
-                     nb_frames = stream->frame_number;
+                 if (nb_frames < avi->packet_count[n])
+                     nb_frames = avi->packet_count[n];
              } else {
                  if (stream->codec_id == CODEC_ID_MP2 || stream->codec_id == CODEC_ID_MP3) {
-                     nb_frames += stream->frame_number;
+                     nb_frames += avi->packet_count[n];
                 }
             }
         }