[Ffmpeg-cvslog] CVS: ffmpeg ffmpeg.c,1.353,1.354

[Alex Beregszaszi]

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

Modified Files:
	ffmpeg.c 
Log Message:
fix ffserver, it is working for me now again, a more elegant fix is needed though

Index: ffmpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -d -r1.353 -r1.354
--- ffmpeg.c	20 Sep 2005 21:43:44 -0000	1.353
+++ ffmpeg.c	12 Oct 2005 23:38:39 -0000	1.354
@@ -420,8 +420,11 @@
     for(i=0;i<ic->nb_streams;i++) {
         AVStream *st;
 
+        // FIXME: a more elegant solution is needed
         st = av_mallocz(sizeof(AVStream));
         memcpy(st, ic->streams[i], sizeof(AVStream));
+        st->codec = avcodec_alloc_context();
+        memcpy(st->codec, ic->streams[i]->codec, sizeof(AVCodecContext));
         s->streams[i] = st;
     }
 
@@ -1742,8 +1745,8 @@
                         goto fail;
 
                     ost->img_resample_ctx = img_resample_full_init( 
-                                      ost->st->codec->width, ost->st->codec->height,
-                                      ist->st->codec->width, ist->st->codec->height,
+                                      codec->width, codec->height,
+                                      icodec->width, icodec->height,
                                       frame_topBand, frame_bottomBand,
                             frame_leftBand, frame_rightBand, 
                             frame_padtop, frame_padbottom,