mirror of
https://github.com/mpv-player/mpv
synced 2024-12-22 06:42:03 +00:00
some updates in muxer api
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11223 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
c2ba883f46
commit
b32c67928a
@ -36,6 +36,7 @@ typedef struct {
|
||||
size_t ipb[3]; // sizes of I/P/B frames
|
||||
// muxer of that stream
|
||||
struct muxer_t *muxer;
|
||||
void *priv; // private stream specific data stored by the muxer
|
||||
} muxer_stream_t;
|
||||
|
||||
typedef struct {
|
||||
|
10
mencoder.c
10
mencoder.c
@ -232,7 +232,7 @@ static int parse_end_at(m_option_t *conf, const char* param);
|
||||
#include "vobsub.h"
|
||||
|
||||
/* FIXME */
|
||||
void mencoder_exit(int level, char *how)
|
||||
static void mencoder_exit(int level, char *how)
|
||||
{
|
||||
if (how)
|
||||
printf("Exiting... (%s)\n", how);
|
||||
@ -385,7 +385,7 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){
|
||||
if(!parse_codec_cfg(MPLAYER_CONFDIR "/codecs.conf")){
|
||||
if(!parse_codec_cfg(NULL)){
|
||||
mp_msg(MSGT_MENCODER,MSGL_HINT,MSGTR_CopyCodecsConf);
|
||||
exit(0);
|
||||
mencoder_exit(1,NULL);
|
||||
}
|
||||
mp_msg(MSGT_MENCODER,MSGL_INFO,MSGTR_BuiltinCodecsConf);
|
||||
}
|
||||
@ -804,7 +804,7 @@ if(audio_delay!=0.0){
|
||||
} // if(sh_audio)
|
||||
|
||||
printf(MSGTR_WritingAVIHeader);
|
||||
muxer_write_header(muxer);
|
||||
if (muxer->cont_write_header) muxer_write_header(muxer);
|
||||
|
||||
decoded_frameno=0;
|
||||
|
||||
@ -1263,11 +1263,11 @@ if(sh_audio && mux_a->codec==ACODEC_VBRMP3 && !lame_param_vbr){
|
||||
#endif
|
||||
|
||||
printf(MSGTR_WritingAVIIndex);
|
||||
muxer_write_index(muxer);
|
||||
if (muxer->cont_write_index) muxer_write_index(muxer);
|
||||
muxer_f_size=ftello(muxer_f);
|
||||
printf(MSGTR_FixupAVIHeader);
|
||||
fseek(muxer_f,0,SEEK_SET);
|
||||
muxer_write_header(muxer); // update header
|
||||
if (muxer->cont_write_header) muxer_write_header(muxer); // update header
|
||||
if(ferror(muxer_f) || fclose(muxer_f) != 0) {
|
||||
mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_ErrorWritingFile, out_filename);
|
||||
mencoder_exit(1, NULL);
|
||||
|
Loading…
Reference in New Issue
Block a user