Revision f7d78f36 ffmpeg.c

View differences:

ffmpeg.c
26 26
#include "framehook.h"
27 27
#include "opt.h"
28 28
#include "fifo.h"
29
#include "avstring.h"
29 30

  
30 31
#ifdef __MINGW32__
31 32
#include <conio.h>
......
2908 2909
    audio_enc->sample_rate = audio_sample_rate;
2909 2910
    audio_enc->time_base= (AVRational){1, audio_sample_rate};
2910 2911
    if (audio_language) {
2911
        pstrcpy(st->language, sizeof(st->language), audio_language);
2912
        av_strlcpy(st->language, audio_language, sizeof(st->language));
2912 2913
        av_free(audio_language);
2913 2914
        audio_language = NULL;
2914 2915
    }
......
2954 2955
    }
2955 2956

  
2956 2957
    if (subtitle_language) {
2957
        pstrcpy(st->language, sizeof(st->language), subtitle_language);
2958
        av_strlcpy(st->language, subtitle_language, sizeof(st->language));
2958 2959
        av_free(subtitle_language);
2959 2960
        subtitle_language = NULL;
2960 2961
    }
......
3006 3007
    }
3007 3008

  
3008 3009
    oc->oformat = file_oformat;
3009
    pstrcpy(oc->filename, sizeof(oc->filename), filename);
3010
    av_strlcpy(oc->filename, filename, sizeof(oc->filename));
3010 3011

  
3011 3012
    if (!strcmp(file_oformat->name, "ffm") &&
3012
        strstart(filename, "http:", NULL)) {
3013
        av_strstart(filename, "http:", NULL)) {
3013 3014
        /* special case for files sent to ffserver: we get the stream
3014 3015
           parameters from ffserver */
3015 3016
        if (read_ffserver_streams(oc, filename) < 0) {
......
3049 3050
        oc->timestamp = rec_timestamp;
3050 3051

  
3051 3052
        if (str_title)
3052
            pstrcpy(oc->title, sizeof(oc->title), str_title);
3053
            av_strlcpy(oc->title, str_title, sizeof(oc->title));
3053 3054
        if (str_author)
3054
            pstrcpy(oc->author, sizeof(oc->author), str_author);
3055
            av_strlcpy(oc->author, str_author, sizeof(oc->author));
3055 3056
        if (str_copyright)
3056
            pstrcpy(oc->copyright, sizeof(oc->copyright), str_copyright);
3057
            av_strlcpy(oc->copyright, str_copyright, sizeof(oc->copyright));
3057 3058
        if (str_comment)
3058
            pstrcpy(oc->comment, sizeof(oc->comment), str_comment);
3059
            av_strlcpy(oc->comment, str_comment, sizeof(oc->comment));
3059 3060
        if (str_album)
3060
            pstrcpy(oc->album, sizeof(oc->album), str_album);
3061
            av_strlcpy(oc->album, str_album, sizeof(oc->album));
3061 3062
    }
3062 3063

  
3063 3064
    output_files[nb_output_files++] = oc;
......
3074 3075
        /* test if it already exists to avoid loosing precious files */
3075 3076
        if (!file_overwrite &&
3076 3077
            (strchr(filename, ':') == NULL ||
3077
             strstart(filename, "file:", NULL))) {
3078
             av_strstart(filename, "file:", NULL))) {
3078 3079
            if (url_exist(filename)) {
3079 3080
                int c;
3080 3081

  

Also available in: Unified diff