[patch] libavcodec fix

LIBAV_1.diff (text/plain), 2.77 KB, created by Oschtan on 2011-07-28 05:15:18 UTC

=== modified file 'src/create_video.c'
--- src/create_video.c	2011-06-25 12:03:01 +0000
+++ src/create_video.c	2011-07-15 22:41:18 +0000
@@ -995,14 +995,12 @@
 	
 	if(lavc_data != NULL)
 	{
-		int nf = clean_lavc(&lavc_data);
-		if(global->debug) g_printf(" total frames encoded: %d\n", nf);
+		clean_lavc(&lavc_data);
 		lavc_data = NULL;
 	}
 	if(lavc_audio_data != NULL)
 	{
-		int nf = clean_lavc_audio(&lavc_audio_data);
-		if(global->debug) g_printf(" total audio frames encoded: %d\n", nf);
+		clean_lavc_audio(&lavc_audio_data);
 		lavc_audio_data = NULL;
 	}
 	if(jpg_data != NULL) g_free(jpg_data);

=== modified file 'src/lavc_common.c'
--- src/lavc_common.c	2010-06-10 13:45:12 +0000
+++ src/lavc_common.c	2011-07-15 22:41:18 +0000
@@ -138,10 +138,10 @@
 int clean_lavc (void* arg)
 {
 	struct lavcData** data= (struct lavcData**) arg;
-	int enc_frames =0;
+	//int enc_frames =0;
 	if(*data)
 	{
-		enc_frames = (*data)->codec_context->real_pict_num;
+		//enc_frames = (*data)->codec_context->real_pict_num;
 		avcodec_flush_buffers((*data)->codec_context);
 		//close codec 
 		avcodec_close((*data)->codec_context);
@@ -154,7 +154,7 @@
 		g_free(*data);
 		*data = NULL;
 	}
-	return (enc_frames);
+	return (0);
 }
 
 int clean_lavc_audio (void* arg)
@@ -160,10 +160,10 @@
 int clean_lavc_audio (void* arg)
 {
        struct lavcAData** data= (struct lavcAData**) arg;
-       int enc_frames =0;
+       //int enc_frames =0;
        if(*data)
        {
-               enc_frames = (*data)->codec_context->real_pict_num;
+               //enc_frames = (*data)->codec_context->real_pict_num;
                avcodec_flush_buffers((*data)->codec_context);
                //close codec
                avcodec_close((*data)->codec_context);
@@ -174,7 +174,7 @@
                g_free(*data);
                *data = NULL;
        }
-       return (enc_frames);
+       return (0);
 }

 struct lavcData* init_lavc(int width, int height, int fps_num, int fps_den, int codec_ind)
@@ -240,7 +240,9 @@
 	data->codec_context->qblur = defaults->qblur;
 	data->codec_context->strict_std_compliance = FF_COMPLIANCE_NORMAL;
 	data->codec_context->codec_id = defaults->codec_id;
+#ifdef 	CODEC_TYPE_VIDEO
 	data->codec_context->codec_type = CODEC_TYPE_VIDEO;
+#endif
 	data->codec_context->pix_fmt = PIX_FMT_YUV420P; //only yuv420p available for mpeg
 	if(defaults->fps)
 		data->codec_context->time_base = (AVRational){1,defaults->fps}; //use properties fps
@@ -299,8 +301,9 @@
 	data->codec_context->cutoff = 0; /*automatic*/
 	//data->codec_context->sample_fmt = SAMPLE_FMT_FLT; /* floating point sample */
 	data->codec_context->codec_id = defaults->codec_id;
+#ifdef CODEC_TYPE_AUDIO
 	data->codec_context->codec_type = CODEC_TYPE_AUDIO;
-	
+#endif	
 	// open codec
 	if (avcodec_open(data->codec_context, data->codec) < 0) 
 	{