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_lavf.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_lavf.c')
-rw-r--r-- | libmpdemux/muxer_lavf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c index 83ece42083..a4113c7d9a 100644 --- a/libmpdemux/muxer_lavf.c +++ b/libmpdemux/muxer_lavf.c @@ -73,7 +73,7 @@ static float mux_preload= 0.5; static float mux_max_delay= 0.7; static char *mux_avopt = NULL; -m_option_t lavfopts_conf[] = { +const m_option_t lavfopts_conf[] = { {"format", &(conf_format), CONF_TYPE_STRING, 0, 0, 0, NULL}, {"muxrate", &mux_rate, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, {"packetsize", &mux_packet_size, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, |