Mercurial > mplayer.hg
comparison cfg-common.h @ 12061:656a1b45b309
Use aspect from encoder for AVI vprp header
author | ranma |
---|---|
date | Wed, 24 Mar 2004 15:16:36 +0000 |
parents | cdf62dc6d6a0 |
children | 67b8d64af8c7 |
comparison
equal
deleted
inserted
replaced
12060:b245a429c896 | 12061:656a1b45b309 |
---|---|
116 #endif | 116 #endif |
117 {"vivo", vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, | 117 {"vivo", vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, |
118 #ifdef HAS_DVBIN_SUPPORT | 118 #ifdef HAS_DVBIN_SUPPORT |
119 {"dvbin", dvbin_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, | 119 {"dvbin", dvbin_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, |
120 #endif | 120 #endif |
121 | |
122 {"useaviaspect", &avi_use_vprp_aspect, CONF_TYPE_FLAG, 0, 0, 1, NULL}, | |
123 {"nouseaviaspect", &avi_use_vprp_aspect, CONF_TYPE_FLAG, 0, 1, 0, NULL}, | |
124 | 121 |
125 // ------------------------- a-v sync options -------------------- | 122 // ------------------------- a-v sync options -------------------- |
126 | 123 |
127 // AVI specific: A-V sync mode (bps vs. interleaving) | 124 // AVI specific: A-V sync mode (bps vs. interleaving) |
128 {"bps", &pts_from_bps, CONF_TYPE_FLAG, 0, 0, 1, NULL}, | 125 {"bps", &pts_from_bps, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
316 extern char* sub_stream; | 313 extern char* sub_stream; |
317 extern int demuxer_type, audio_demuxer_type, sub_demuxer_type; | 314 extern int demuxer_type, audio_demuxer_type, sub_demuxer_type; |
318 extern int ts_prog; | 315 extern int ts_prog; |
319 extern int ts_keep_broken; | 316 extern int ts_keep_broken; |
320 extern off_t ts_probe; | 317 extern off_t ts_probe; |
321 | |
322 extern int avi_use_vprp_aspect; /* defined in aviheader.c */ | |
323 | 318 |
324 #include "libmpdemux/tv.h" | 319 #include "libmpdemux/tv.h" |
325 | 320 |
326 #ifdef USE_EDL | 321 #ifdef USE_EDL |
327 extern char* edl_filename; | 322 extern char* edl_filename; |