use av_strdup()

Originally committed as revision 1507 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Fabrice Bellard 22 years ago
parent 0d4c587854
commit e9a9e0c210
  1. 8
      ffmpeg.c
  2. 2
      libavformat/ffm.c
  3. 2
      vhook/fish.c
  4. 4
      vhook/imlib2.c

@ -1870,7 +1870,7 @@ void opt_audio_channels(const char *arg)
void opt_video_device(const char *arg) void opt_video_device(const char *arg)
{ {
video_device = strdup(arg); video_device = av_strdup(arg);
} }
void opt_video_channel(const char *arg) void opt_video_channel(const char *arg)
@ -1880,7 +1880,7 @@ void opt_video_channel(const char *arg)
void opt_audio_device(const char *arg) void opt_audio_device(const char *arg)
{ {
audio_device = strdup(arg); audio_device = av_strdup(arg);
} }
void opt_dv1394(const char *arg) void opt_dv1394(const char *arg)
@ -1916,7 +1916,7 @@ void add_frame_hooker(const char *arg)
int argc = 0; int argc = 0;
char *argv[64]; char *argv[64];
int i; int i;
char *args = strdup(arg); char *args = av_strdup(arg);
argv[0] = strtok(args, " "); argv[0] = strtok(args, " ");
while (argc < 62 && (argv[++argc] = strtok(NULL, " "))) { while (argc < 62 && (argv[++argc] = strtok(NULL, " "))) {
@ -2812,7 +2812,7 @@ int main(int argc, char **argv)
} }
if (po->flags & OPT_STRING) { if (po->flags & OPT_STRING) {
char *str; char *str;
str = strdup(arg); str = av_strdup(arg);
*po->u.str_arg = str; *po->u.str_arg = str;
} else if (po->flags & OPT_BOOL) { } else if (po->flags & OPT_BOOL) {
*po->u.int_arg = 1; *po->u.int_arg = 1;

@ -421,7 +421,7 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
codec->qcompress = get_be16(pb) / 10000.0; codec->qcompress = get_be16(pb) / 10000.0;
codec->qblur = get_be16(pb) / 10000.0; codec->qblur = get_be16(pb) / 10000.0;
codec->bit_rate_tolerance = get_be32(pb); codec->bit_rate_tolerance = get_be32(pb);
codec->rc_eq = strdup(get_strz(pb, rc_eq_buf, sizeof(rc_eq_buf))); codec->rc_eq = av_strdup(get_strz(pb, rc_eq_buf, sizeof(rc_eq_buf)));
codec->rc_max_rate = get_be32(pb); codec->rc_max_rate = get_be32(pb);
codec->rc_min_rate = get_be32(pb); codec->rc_min_rate = get_be32(pb);
codec->rc_buffer_size = get_be32(pb); codec->rc_buffer_size = get_be32(pb);

@ -134,7 +134,7 @@ int Configure(void **ctxp, int argc, char *argv[])
ci->debug++; ci->debug++;
break; break;
case 'D': case 'D':
ci->dir = strdup(optarg); ci->dir = av_strdup(optarg);
break; break;
default: default:
fprintf(stderr, "Unrecognized argument '%s'\n", argv[optind]); fprintf(stderr, "Unrecognized argument '%s'\n", argv[optind]);

@ -112,10 +112,10 @@ int Configure(void **ctxp, int argc, char *argv[])
font = optarg; font = optarg;
break; break;
case 't': case 't':
ci->text = strdup(optarg); ci->text = av_strdup(optarg);
break; break;
case 'f': case 'f':
ci->file = strdup(optarg); ci->file = av_strdup(optarg);
break; break;
case 'x': case 'x':
ci->x = atoi(optarg); ci->x = atoi(optarg);

Loading…
Cancel
Save