diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:54:52 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:55:05 +0300 |
commit | e913d6c5dabcf342d8c1a7070382d712fc354948 (patch) | |
tree | 965b5b698c7075e53123593eb4b5bfdb45d78c56 /libmpdemux/muxer_mpeg.c | |
parent | be935e27666d8fdbf387adb1fcc30d243f6359dc (diff) | |
parent | 00959d5cf76d4ad94de9d0022b7b40a58acf2b95 (diff) | |
download | mpv-e913d6c5dabcf342d8c1a7070382d712fc354948.tar.bz2 mpv-e913d6c5dabcf342d8c1a7070382d712fc354948.tar.xz |
Merge svn changes up to r31004
Diffstat (limited to 'libmpdemux/muxer_mpeg.c')
-rw-r--r-- | libmpdemux/muxer_mpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index 00bb9d0792..55e2923a13 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -207,7 +207,7 @@ typedef struct { #define TELECINE_FILM2PAL 2 #define TELECINE_DGPULLDOWN 3 -m_option_t mpegopts_conf[] = { +const m_option_t mpegopts_conf[] = { {"format", &(conf_mux), CONF_TYPE_STRING, M_OPT_GLOBAL, 0 ,0, NULL}, {"size", &(conf_packet_size), CONF_TYPE_INT, M_OPT_GLOBAL|M_OPT_RANGE, 0, 65535, NULL}, {"muxrate", &(conf_muxrate), CONF_TYPE_INT, M_OPT_GLOBAL|M_OPT_RANGE, 0, 12000000, NULL}, //12 Mb/s |