summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-10 19:22:41 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-10 19:22:41 +0000
commit2ce3df53b1936fd52e6bb58868c34ae2fef989fa (patch)
tree3c6ea256666312c8d97efcaae34b491273aeb4dd /libmpdemux
parent16aa40b6f874b19869ebead46881876e9c0a5c1e (diff)
downloadmpv-2ce3df53b1936fd52e6bb58868c34ae2fef989fa.tar.bz2
mpv-2ce3df53b1936fd52e6bb58868c34ae2fef989fa.tar.xz
AVOptions support for lavf muxing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26727 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/muxer_lavf.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c
index b14a2758fb..7b027a97ec 100644
--- a/libmpdemux/muxer_lavf.c
+++ b/libmpdemux/muxer_lavf.c
@@ -10,6 +10,7 @@
#include "aviheader.h"
#include "ms_hdr.h"
+#include "av_opts.h"
#include "stream/stream.h"
#include "muxer.h"
@@ -50,6 +51,7 @@ static int mux_rate= 0;
static int mux_packet_size= 0;
static float mux_preload= 0.5;
static float mux_max_delay= 0.7;
+static char *mux_avopt = NULL;
m_option_t lavfopts_conf[] = {
{"format", &(conf_format), CONF_TYPE_STRING, 0, 0, 0, NULL},
@@ -57,6 +59,7 @@ m_option_t lavfopts_conf[] = {
{"packetsize", &mux_packet_size, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL},
{"preload", &mux_preload, CONF_TYPE_FLOAT, CONF_RANGE, 0, INT_MAX, NULL},
{"delay", &mux_max_delay, CONF_TYPE_FLOAT, CONF_RANGE, 0, INT_MAX, NULL},
+ {"o", &mux_avopt, CONF_TYPE_STRING, 0, 0, 0, NULL},
{NULL, NULL, 0, 0, 0, 0, NULL}
};
@@ -392,6 +395,14 @@ int muxer_init_muxer_lavf(muxer_t *muxer)
av_strlcpy(priv->oc->copyright, info_copyright, sizeof(priv->oc->copyright));
if (info_comment)
av_strlcpy(priv->oc->comment , info_comment, sizeof(priv->oc->comment ));
+
+ if(mux_avopt){
+ if(parse_avopts(priv->oc, mux_avopt) < 0){
+ mp_msg(MSGT_MUXER,MSGL_ERR, "Your options /%s/ look like gibberish to me pal\n", mux_avopt);
+ goto fail;
+ }
+ }
+
register_protocol(&mp_protocol);
priv_data= muxer;