ffmpeg | branch: master | Thilo Borgmann <thilo.borgm...@mail.de> | Mon Nov 10 20:31:14 2014 +0100| [48c29883fcb27406123713153422d89e82de5cfc] | committer: Michael Niedermayer
lavd/avfoundation: Use internal av_strtok instead of std lib strtok Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=48c29883fcb27406123713153422d89e82de5cfc --- libavdevice/avfoundation.m | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m index 5e5f70b..e756225 100644 --- a/libavdevice/avfoundation.m +++ b/libavdevice/avfoundation.m @@ -30,6 +30,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/opt.h" +#include "libavutil/avstring.h" #include "libavformat/internal.h" #include "libavutil/internal.h" #include "libavutil/time.h" @@ -253,12 +254,13 @@ static void parse_device_name(AVFormatContext *s) { AVFContext *ctx = (AVFContext*)s->priv_data; char *tmp = av_strdup(s->filename); + char *save; if (tmp[0] != ':') { - ctx->video_filename = strtok(tmp, ":"); - ctx->audio_filename = strtok(NULL, ":"); + ctx->video_filename = av_strtok(tmp, ":", &save); + ctx->audio_filename = av_strtok(NULL, ":", &save); } else { - ctx->audio_filename = strtok(tmp, ":"); + ctx->audio_filename = av_strtok(tmp, ":", &save); } } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
