[Mplayer-cvslog] CVS: main/libmpcodecs ve_x264.c,1.2,1.3

Ivan Kalvachev CVS syncmail at mplayerhq.hu
Tue Sep 14 18:57:40 CEST 2004


CVS change done by Ivan Kalvachev CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv9953

Modified Files:
	ve_x264.c 
Log Message:
fix compile on gcc 2.95.3
patch send by Jan Knutar <jknutar_at_nic_dot_fi>


Index: ve_x264.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_x264.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ve_x264.c	12 Sep 2004 15:36:43 -0000	1.2
+++ ve_x264.c	14 Sep 2004 16:57:37 -0000	1.3
@@ -269,6 +269,7 @@
     int i_nal;
     x264_nal_t *nal;
     int i;
+    int i_size = 0;
     
     int csp=mod->pic.img.i_csp;
     memset(&mod->pic, 0, sizeof(x264_picture_t));
@@ -285,7 +286,6 @@
         return 0;
     }
     
-    int i_size = 0;
     for(i=0; i < i_nal; i++) {
         int i_data = mod->mux->buffer_size - i_size;
         i_size += x264_nal_encode(mod->mux->buffer + i_size, &i_data, 1, &nal[i]);
@@ -305,6 +305,8 @@
 }
 
 static int vf_open(vf_instance_t *vf, char *args) {
+    h264_module_t *mod;
+
     vf->config = config;
     vf->control = control;
     vf->query_format = query_format;
@@ -312,7 +314,7 @@
     vf->uninit = uninit;
     vf->priv = malloc(sizeof(h264_module_t));
 
-    h264_module_t *mod=(h264_module_t*)vf->priv;
+    mod=(h264_module_t*)vf->priv;
     mod->mux = (muxer_stream_t*)args;
     mod->mux->bih = malloc(sizeof(BITMAPINFOHEADER));
     memset(mod->mux->bih, 0, sizeof(BITMAPINFOHEADER));




More information about the MPlayer-cvslog mailing list