diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-13 02:40:09 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-13 02:40:09 +0000 |
| commit | 3d19a5474de0f0cb3c8ae0d92cde2cb8c6bf666a (patch) | |
| tree | 2a7f8d0639c76acfd17140b605c1a339e4bc5a94 /libmpcodecs | |
| parent | e8954b5bf9beb6e80f8cb304826d570090b277e7 (diff) | |
| download | mpv-3d19a5474de0f0cb3c8ae0d92cde2cb8c6bf666a.tar.bz2 mpv-3d19a5474de0f0cb3c8ae0d92cde2cb8c6bf666a.tar.xz | |
-lavcopts aglobal
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17843 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ae_lavc.c | 8 | ||||
| -rw-r--r-- | libmpcodecs/ve_lavc.c | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c index af9b65dffa..8893ec5f9b 100644 --- a/libmpcodecs/ae_lavc.c +++ b/libmpcodecs/ae_lavc.c @@ -24,6 +24,7 @@ static AVCodecContext *lavc_actx; 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 mpae_init_lavc(audio_encoder_t *encoder) 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) { diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 8e8f2ff793..f4674280e0 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -163,6 +163,7 @@ static int lavc_param_video_global_header= 0; 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 @@ m_option_t lavcopts_conf[]={ {"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 |