diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-10-17 14:44:39 +0300 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-10-17 14:44:39 +0300 |
| commit | 4467de60c581f2a5f7ae737c30ab63be0e3f6e25 (patch) | |
| tree | 37d2893e34f613a65383f9288d0af3b985fcd85f /src/post | |
| parent | 81c84b6bf06482c5988fd16f68050177c1afc358 (diff) | |
| parent | 9f105cfe9059df4a9a1f5278679151a5d9c387f6 (diff) | |
| download | xine-lib-4467de60c581f2a5f7ae737c30ab63be0e3f6e25.tar.gz xine-lib-4467de60c581f2a5f7ae737c30ab63be0e3f6e25.tar.bz2 | |
Merge from 1.1
Diffstat (limited to 'src/post')
| -rw-r--r-- | src/post/mosaico/mosaico.c | 2 | ||||
| -rw-r--r-- | src/post/planar/pp.c | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/post/mosaico/mosaico.c b/src/post/mosaico/mosaico.c index 842588c01..79272e8db 100644 --- a/src/post/mosaico/mosaico.c +++ b/src/post/mosaico/mosaico.c @@ -179,7 +179,7 @@ static post_plugin_t *mosaico_open_plugin(post_class_t *class_gen, int inputs, this->pip[i].y = 50; this->pip[i].w = 150; this->pip[i].h = 150; - asprintf(&(this->pip[i].input_name), "video in %d", i+1); + this->pip[i].input_name = _x_asprintf("video in %d", i+1); port = _x_post_intercept_video_port(&this->post, video_target[0], &input, NULL); port->new_port.close = mosaico_close; diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c index 767d52f96..ab1fc3a9f 100644 --- a/src/post/planar/pp.c +++ b/src/post/planar/pp.c @@ -123,16 +123,17 @@ static char * get_help (void) { static char *help = NULL; if( !help ) { - asprintf(&help, "%s%s%s", - _("FFmpeg libpostprocess plugin.\n" - "\n" - "Parameters\n" - "\n"), - pp_help, - _("\n" - "* libpostprocess (C) Michael Niedermayer\n") - ); + help = _x_asprintf("%s%s%s", + _("FFmpeg libpostprocess plugin.\n" + "\n" + "Parameters\n" + "\n"), + pp_help, + _("\n" + "* libpostprocess (C) Michael Niedermayer\n") + ); } + return help; } |