[MPlayer-cvslog] CVS: main/libmpcodecs ve_lavc.c, 1.132, 1.133 ae_lavc.c, 1.8, 1.9

[Michael Niedermayer CVS]

CVS change done by Michael Niedermayer CVS

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

Modified Files:
	ve_lavc.c ae_lavc.c 
Log Message:
-lavcopts aglobal


Index: ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- ve_lavc.c	21 Feb 2006 09:39:21 -0000	1.132
+++ ve_lavc.c	13 Mar 2006 02:40:09 -0000	1.133
@@ -163,6 +163,7 @@
 char *lavc_param_acodec = "mp2";
 int lavc_param_atag = 0;
 int lavc_param_abitrate = 224;
+int lavc_param_audio_global_header= 0;
 
 #include "m_option.h"
 
@@ -316,6 +317,7 @@
 	{"bidir_refine", &lavc_param_bidir_refine, CONF_TYPE_INT, CONF_RANGE, 0, 4, NULL},
 	{"sc_factor", &lavc_param_sc_factor, CONF_TYPE_INT, CONF_RANGE, 1, INT_MAX, NULL},
 	{"vglobal", &lavc_param_video_global_header, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL},
+	{"aglobal", &lavc_param_audio_global_header, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 #endif

Index: ae_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ae_lavc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ae_lavc.c	9 Jan 2006 19:35:44 -0000	1.8
+++ ae_lavc.c	13 Mar 2006 02:40:09 -0000	1.9
@@ -24,6 +24,7 @@
 extern char *lavc_param_acodec;
 extern int  lavc_param_abitrate;
 extern int  lavc_param_atag;
+extern int  lavc_param_audio_global_header;
 extern int  avcodec_inited;
 static int compressed_frame_size = 0;
 #if defined(USE_LIBAVFORMAT) ||  defined(USE_LIBAVFORMAT_SO)
@@ -206,6 +207,13 @@
 		int framesize = (blkalign - 4 * lavc_actx->channels) * 8 / (4 * lavc_actx->channels) + 1;
 		lavc_actx->bit_rate = lavc_actx->sample_rate*8*blkalign/framesize;
 	}
+        if((lavc_param_audio_global_header&1)
+        /*|| (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))*/){
+                lavc_actx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+        }
+        if(lavc_param_audio_global_header&2){
+                lavc_actx->flags2 |= CODEC_FLAG2_LOCAL_HEADER;
+        }
 
 	if(avcodec_open(lavc_actx, lavc_acodec) < 0)
 	{