Mercurial > mplayer.hg
view libmpdemux/muxer.c @ 14879:3b89d966f17e
Sync with 1.893:
1.881: added new mpeg muxer options
1.882: done in a previous commit
1.883: fixes for previous commits
1.884: Mention that vstrict is necessary for some codecs, add ffvhuff.
1.885: Finish incomplete -af-adv documentation.
1.886: Sync -channels and -srate options with the XML docs.
1.887: spelling, wording and consistency fixes
1.888: renamed init_adelay to vdelay with opposite range
1.889: List the 'context' option for the ffvhuff codec.
1.890: indentation fix
1.891: vstrict vs mjpeg update, typo
1.892: done in a previous commit
1.893: done in a previous commit
author | gpoirier |
---|---|
date | Tue, 01 Mar 2005 20:33:50 +0000 |
parents | 7a2adc5e8928 |
children | 7b0599d9614a |
line wrap: on
line source
#include <stdio.h> #include <stdlib.h> #include <string.h> #include <inttypes.h> #include <unistd.h> #include "config.h" #include "../version.h" #include "aviheader.h" #include "ms_hdr.h" #include "muxer.h" #include "stream.h" #include "demuxer.h" #include "mp_msg.h" #include "help_mp.h" #include "stheader.h" muxer_t *muxer_new_muxer(int type,FILE *f){ muxer_t* muxer=malloc(sizeof(muxer_t)); memset(muxer,0,sizeof(muxer_t)); muxer->file = f; switch (type) { case MUXER_TYPE_MPEG: if(! muxer_init_muxer_mpeg(muxer)) return NULL; break; case MUXER_TYPE_RAWVIDEO: if(! muxer_init_muxer_rawvideo(muxer)) return NULL; break; #ifdef USE_LIBAVFORMAT case MUXER_TYPE_LAVF: if(! muxer_init_muxer_lavf(muxer)) return NULL; break; #endif case MUXER_TYPE_AVI: default: if(! muxer_init_muxer_avi(muxer)) return NULL; } return muxer; }