Mercurial > mplayer.hg
comparison libmpcodecs/ve_divx4.c @ 8585:27da710563c2
the long-waited MUXER layer, and new MPEG-PS muxer
patch by Andriy N. Gritsenko <andrej@lucky.net>
author | arpi |
---|---|
date | Fri, 27 Dec 2002 22:43:20 +0000 |
parents | 136e7e515764 |
children | c671e9adbe22 |
comparison
equal
deleted
inserted
replaced
8584:2d4328af7ea9 | 8585:27da710563c2 |
---|---|
11 #include "codec-cfg.h" | 11 #include "codec-cfg.h" |
12 #include "stream.h" | 12 #include "stream.h" |
13 #include "demuxer.h" | 13 #include "demuxer.h" |
14 #include "stheader.h" | 14 #include "stheader.h" |
15 | 15 |
16 #include "aviwrite.h" | 16 #include "muxer.h" |
17 | 17 |
18 #include "img_format.h" | 18 #include "img_format.h" |
19 #include "mp_image.h" | 19 #include "mp_image.h" |
20 #include "vf.h" | 20 #include "vf.h" |
21 | 21 |
42 #include "xvid_vbr.h" | 42 #include "xvid_vbr.h" |
43 #endif | 43 #endif |
44 | 44 |
45 static int pass; | 45 static int pass; |
46 extern char* passtmpfile; | 46 extern char* passtmpfile; |
47 extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags); | 47 extern void mencoder_write_chunk(muxer_stream_t *s,int len,unsigned int flags); |
48 | 48 |
49 #include <encore2.h> | 49 #include <encore2.h> |
50 | 50 |
51 #ifndef ENCORE_MAJOR_VERSION | 51 #ifndef ENCORE_MAJOR_VERSION |
52 #define ENCORE_MAJOR_VERSION 4000 | 52 #define ENCORE_MAJOR_VERSION 4000 |
94 {"help", "TODO: divx4opts help!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 94 {"help", "TODO: divx4opts help!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
95 {NULL, NULL, 0, 0, 0, 0, NULL} | 95 {NULL, NULL, 0, 0, 0, 0, NULL} |
96 }; | 96 }; |
97 | 97 |
98 struct vf_priv_s { | 98 struct vf_priv_s { |
99 aviwrite_stream_t* mux; | 99 muxer_stream_t* mux; |
100 ENC_RESULT enc_result; | 100 ENC_RESULT enc_result; |
101 ENC_FRAME enc_frame; | 101 ENC_FRAME enc_frame; |
102 void* enc_handle; | 102 void* enc_handle; |
103 #ifdef HAVE_XVID_VBR | 103 #ifdef HAVE_XVID_VBR |
104 vbr_control_t vbr_state; | 104 vbr_control_t vbr_state; |
287 #ifdef HAVE_XVID_VBR | 287 #ifdef HAVE_XVID_VBR |
288 vf->uninit = uninit; | 288 vf->uninit = uninit; |
289 #endif | 289 #endif |
290 vf->priv=malloc(sizeof(struct vf_priv_s)); | 290 vf->priv=malloc(sizeof(struct vf_priv_s)); |
291 memset(vf->priv,0,sizeof(struct vf_priv_s)); | 291 memset(vf->priv,0,sizeof(struct vf_priv_s)); |
292 vf->priv->mux=(aviwrite_stream_t*)args; | 292 vf->priv->mux=(muxer_stream_t*)args; |
293 | 293 |
294 mux_v->bih=malloc(sizeof(BITMAPINFOHEADER)); | 294 mux_v->bih=malloc(sizeof(BITMAPINFOHEADER)); |
295 mux_v->bih->biSize=sizeof(BITMAPINFOHEADER); | 295 mux_v->bih->biSize=sizeof(BITMAPINFOHEADER); |
296 mux_v->bih->biWidth=0; | 296 mux_v->bih->biWidth=0; |
297 mux_v->bih->biHeight=0; | 297 mux_v->bih->biHeight=0; |