RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

write out extraheaders from lavc 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11975 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2004-02-18 13:33:16 +00:00
parent 171c2ae2f4
commit 7c231eee58
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mencoder.c
View File

@ -730,6 +730,8 @@ mux_a=muxer_new_stream(muxer,MUXER_TYPE_AUDIO);
mux_a->buffer_size=0x100000; //16384;
mux_a->buffer=malloc(mux_a->buffer_size);
if (!mux_a->buffer)
mencoder_exit(1,"memory allocation failed");
mux_a->source=sh_audio;
@ -894,10 +896,7 @@ case ACODEC_LAVC:
exit(1);
}
if (sizeof(MPEGLAYER3WAVEFORMAT) != 30) // should be 30
broken_c_compiler___size_of_MPEGLAYER3WAVEFORMAT_not_30();
mux_a->wf = malloc(sizeof(MPEGLAYER3WAVEFORMAT));
mux_a->wf = malloc(sizeof(WAVEFORMATEX)+lavc_actx->extradata_size+256);
mux_a->wf->wFormatTag = lavc_param_atag;
mux_a->wf->nChannels = lavc_actx->channels;
mux_a->wf->nSamplesPerSec = lavc_actx->sample_rate;
@ -942,11 +941,21 @@ case ACODEC_LAVC:
((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->nCodecDelay = 0;
break;
default:
mux_a->wf->cbSize = 0;
mux_a->wf->wBitsPerSample = 0; /* Unknown */
if (lavc_actx->extradata && (lavc_actx->extradata_size > 0))
{
memcpy(mux_a->wf+sizeof(WAVEFORMATEX), lavc_actx->extradata,
lavc_actx->extradata_size);
mux_a->wf->cbSize = lavc_actx->extradata_size;
}
else
mux_a->wf->cbSize = 0;
break;
}
// Fix allocation
mux_a->wf = realloc(mux_a->wf, sizeof(WAVEFORMATEX)+mux_a->wf->cbSize);
// setup filter:
if (!init_audio_filters(
sh_audio,
@ -1827,6 +1836,9 @@ static uint32_t lavc_find_atag(char *codec)
if(! strcasecmp(codec, "adpcm_ima_wav"))
return 0x11;
if(! strncasecmp(codec, "bonk", 4))
return 0x2048;
return 0;
}
#endif