From 78ecbc1e6f3c19ef6392dbaa492e7fb4fbd46edc Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 3 Feb 2010 22:36:47 +0000 Subject: [PATCH] Replace incorrect usage of strncpy. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30500 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_lavf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 463a3b4991..03e617536c 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -37,6 +37,7 @@ #include "libavformat/avformat.h" #include "libavformat/avio.h" #include "libavutil/avutil.h" +#include "libavutil/avstring.h" #include "libavcodec/opt.h" #include "mp_taglists.h" @@ -462,11 +463,11 @@ static demuxer_t* demux_open_lavf(demuxer_t *demuxer){ if(demuxer->stream->url) { if (!strncmp(demuxer->stream->url, "ffmpeg://rtsp:", 14)) - strncpy(mp_filename, demuxer->stream->url + 9, sizeof(mp_filename)-3); + av_strlcpy(mp_filename, demuxer->stream->url + 9, sizeof(mp_filename)); else - strncpy(mp_filename + 3, demuxer->stream->url, sizeof(mp_filename)-3); + av_strlcat(mp_filename, demuxer->stream->url, sizeof(mp_filename)); } else - strncpy(mp_filename + 3, "foobar.dummy", sizeof(mp_filename)-3); + av_strlcat(mp_filename, "foobar.dummy", sizeof(mp_filename)); priv->pb = av_alloc_put_byte(priv->buffer, BIO_BUFFER_SIZE, 0, demuxer->stream, mp_read, NULL, mp_seek);