diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-27 22:43:20 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-27 22:43:20 +0000 |
commit | bf46a109ede5d25f506cc75ae80fe1acc5b34edd (patch) | |
tree | a2cd8454df8950c0ab1ced5add63f293ea35d242 /libmpcodecs/ve_lavc.c | |
parent | bc9afe8d39c9e12596677be1141f8098fec73db6 (diff) | |
download | mpv-bf46a109ede5d25f506cc75ae80fe1acc5b34edd.tar.bz2 mpv-bf46a109ede5d25f506cc75ae80fe1acc5b34edd.tar.xz |
the long-waited MUXER layer, and new MPEG-PS muxer
patch by Andriy N. Gritsenko <andrej@lucky.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8586 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/ve_lavc.c')
-rw-r--r-- | libmpcodecs/ve_lavc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 30c22b5ef3..b064a777e5 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -20,14 +20,14 @@ #include "demuxer.h" #include "stheader.h" -#include "aviwrite.h" +#include "muxer.h" #include "img_format.h" #include "mp_image.h" #include "vf.h" extern char* passtmpfile; -extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags); +extern void mencoder_write_chunk(muxer_stream_t *s,int len,unsigned int flags); //===========================================================================// @@ -175,7 +175,7 @@ struct config lavcopts_conf[]={ #endif struct vf_priv_s { - aviwrite_stream_t* mux; + muxer_stream_t* mux; AVCodecContext *context; AVFrame *pic; AVCodec *codec; @@ -531,7 +531,7 @@ static int vf_open(vf_instance_t *vf, char* args){ vf->put_image=put_image; vf->priv=malloc(sizeof(struct vf_priv_s)); memset(vf->priv,0,sizeof(struct vf_priv_s)); - vf->priv->mux=(aviwrite_stream_t*)args; + vf->priv->mux=(muxer_stream_t*)args; /* XXX: hack: some of the MJPEG decoder DLL's needs exported huffman table, so we define a zero-table, also lavc mjpeg encoder is putting |