History

Replace outdated references to ffmpeg tool with avconv.

Diego Biurrun committed 15 years ago

Commit 20566eb1 parent 124e2888 files · +17 −13Browse files

Unified · Split

8 files
  1. avplay.c +1 −1
  2. avserver.c +3 −3
  3. libavcodec/adxenc.c +1 −1
  4. libavcodec/libxvidff.c +3 −3
  5. libavformat/cutils.c +1 −1
  6. libavformat/http.c +2 −2
  7. libavformat/movenc.h +1 −1
  8. libavformat/nsvdec.c +5 −1
avplay.c+1−1
@@ -2997,7 +2997,7 @@ static const OptionDef options[] = { · 2996 unmodified lines
2997#endif2997#endif
2998 { "rdftspeed", OPT_INT | HAS_ARG| OPT_AUDIO | OPT_EXPERT, {(void*)&rdftspeed}, "rdft speed", "msecs" },2998 { "rdftspeed", OPT_INT | HAS_ARG| OPT_AUDIO | OPT_EXPERT, {(void*)&rdftspeed}, "rdft speed", "msecs" },
2999 { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },2999 { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
3000 { "i", 0, {NULL}, "ffmpeg compatibility dummy option", ""},3000 { "i", 0, {NULL}, "avconv compatibility dummy option", ""},
3001 { NULL, },3001 { NULL, },
3002};3002};
3003 3003
avserver.c+3−3
@@ -223,8 +223,8 @@ typedef struct FFStream { · 222 unmodified lines
223 char title[512];223 char title[512];
224 char copyright[512];224 char copyright[512];
225 char comment[512];225 char comment[512];
226 pid_t pid; /* Of ffmpeg process */226 pid_t pid; /* of avconv process */
227 time_t pid_start; /* Of ffmpeg process */227 time_t pid_start; /* of avconv process */
228 char **child_argv;228 char **child_argv;
229 struct FFStream *next;229 struct FFStream *next;
230 unsigned bandwidth; /* bandwidth, in kbits/s */230 unsigned bandwidth; /* bandwidth, in kbits/s */
@@ -474,7 +474,7 @@ static void start_children(FFStream *feed) · 243 unmodified lines
474 slash = pathname;474 slash = pathname;
475 else475 else
476 slash++;476 slash++;
477 strcpy(slash, "ffmpeg");477 strcpy(slash, "avconv");
478 478
479 http_log("Launch commandline: ");479 http_log("Launch commandline: ");
480 http_log("%s ", pathname);480 http_log("%s ", pathname);
libavcodec/adxenc.c+1−1
@@ -145,7 +145,7 @@ static int adx_encode_frame(AVCodecContext *avctx, · 144 unmodified lines
145 145
146/*146/*
147 input data size =147 input data size =
148 ffmpeg.c: do_audio_out()148 avconv.c:do_audio_out()
149 frame_bytes = enc->frame_size * 2 * enc->channels;149 frame_bytes = enc->frame_size * 2 * enc->channels;
150*/150*/
151 151
libavcodec/libxvidff.c+3−3
@@ -137,7 +137,7 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { · 136 unmodified lines
137 xvid_enc_create_t xvid_enc_create;137 xvid_enc_create_t xvid_enc_create;
138 xvid_enc_plugin_t plugins[7];138 xvid_enc_plugin_t plugins[7];
139 139
140 /* Bring in VOP flags from ffmpeg command-line */140 /* Bring in VOP flags from avconv command-line */
141 x->vop_flags = XVID_VOP_HALFPEL; /* Bare minimum quality */141 x->vop_flags = XVID_VOP_HALFPEL; /* Bare minimum quality */
142 if( xvid_flags & CODEC_FLAG_4MV )142 if( xvid_flags & CODEC_FLAG_4MV )
143 x->vop_flags |= XVID_VOP_INTER4V; /* Level 3 */143 x->vop_flags |= XVID_VOP_INTER4V; /* Level 3 */
@@ -191,7 +191,7 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx) { · 47 unmodified lines
191 break;191 break;
192 }192 }
193 193
194 /* Bring in VOL flags from ffmpeg command-line */194 /* Bring in VOL flags from avconv command-line */
195 x->vol_flags = 0;195 x->vol_flags = 0;
196 if( xvid_flags & CODEC_FLAG_GMC ) {196 if( xvid_flags & CODEC_FLAG_GMC ) {
197 x->vol_flags |= XVID_VOL_GMC;197 x->vol_flags |= XVID_VOL_GMC;
@@ -669,7 +669,7 @@ static int xvid_ff_2pass_create(xvid_plg_create_t * param, · 471 unmodified lines
669 /* This is because we can safely prevent a buffer overflow */669 /* This is because we can safely prevent a buffer overflow */
670 log[0] = 0;670 log[0] = 0;
671 snprintf(log, BUFFER_REMAINING(log),671 snprintf(log, BUFFER_REMAINING(log),
672 "# ffmpeg 2-pass log file, using xvid codec\n");672 "# avconv 2-pass log file, using xvid codec\n");
673 snprintf(BUFFER_CAT(log), BUFFER_REMAINING(log),673 snprintf(BUFFER_CAT(log), BUFFER_REMAINING(log),
674 "# Do not modify. libxvidcore version: %d.%d.%d\n\n",674 "# Do not modify. libxvidcore version: %d.%d.%d\n\n",
675 XVID_VERSION_MAJOR(XVID_VERSION),675 XVID_VERSION_MAJOR(XVID_VERSION),
libavformat/cutils.c+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
24/* add one element to a dynamic array */24/* add one element to a dynamic array */
25void ff_dynarray_add(intptr_t **tab_ptr, int *nb_ptr, intptr_t elem)25void ff_dynarray_add(intptr_t **tab_ptr, int *nb_ptr, intptr_t elem)
26{26{
27 /* see similar ffmpeg.c:grow_array() */27 /* see similar avconv.c:grow_array() */
28 int nb, nb_alloc;28 int nb, nb_alloc;
29 intptr_t *tab;29 intptr_t *tab;
30 30
libavformat/http.c+2−2
@@ -1,5 +1,5 @@
1/*1/*
2 * HTTP protocol for ffmpeg client2 * HTTP protocol for avconv client
3 * Copyright (c) 2000, 2001 Fabrice Bellard3 * Copyright (c) 2000, 2001 Fabrice Bellard
4 *4 *
5 * This file is part of Libav.5 * This file is part of Libav.
@@ -31,7 +31,7 @@ · 25 unmodified lines
31#include "url.h"31#include "url.h"
32#include "libavutil/opt.h"32#include "libavutil/opt.h"
33 33
34/* XXX: POST protocol is not completely implemented because ffmpeg uses34/* XXX: POST protocol is not completely implemented because avconv uses
35 only a subset of it. */35 only a subset of it. */
36 36
37/* used for protocol handling */37/* used for protocol handling */
libavformat/movenc.h+1−1
@@ -35,7 +35,7 @@ · 34 unmodified lines
35#define MODE_MOV 0x0235#define MODE_MOV 0x02
36#define MODE_3GP 0x0436#define MODE_3GP 0x04
37#define MODE_PSP 0x08 // example working PSP command line:37#define MODE_PSP 0x08 // example working PSP command line:
38// ffmpeg -i testinput.avi -f psp -r 14.985 -s 320x240 -b 768 -ar 24000 -ab 32 M4V00001.MP438// avconv -i testinput.avi -f psp -r 14.985 -s 320x240 -b 768 -ar 24000 -ab 32 M4V00001.MP4
39#define MODE_3G2 0x1039#define MODE_3G2 0x10
40#define MODE_IPOD 0x2040#define MODE_IPOD 0x20
41 41
libavformat/nsvdec.c+5−1
@@ -71,7 +71,11 @@ · 70 unmodified lines
71 * so the header seems to not be mandatory. (for streaming).71 * so the header seems to not be mandatory. (for streaming).
72 *72 *
73 * index slice duration check (excepts nsvtrailer.nsv):73 * index slice duration check (excepts nsvtrailer.nsv):
74 * for f in [^n]*.nsv; do DUR="$(ffmpeg -i "$f" 2>/dev/null | grep 'NSVf duration' | cut -d ' ' -f 4)"; IC="$(ffmpeg -i "$f" 2>/dev/null | grep 'INDEX ENTRIES' | cut -d ' ' -f 2)"; echo "duration $DUR, slite time $(($DUR/$IC))"; done74 * for f in [^n]*.nsv; do
75 * DUR="$(avconv -i "$f" 2> /dev/null | grep 'NSVf duration' | cut -d ' ' -f 4)"
76 * IC="$(avconv -i "$f" 2> /dev/null | grep 'INDEX ENTRIES' | cut -d ' ' -f 2)"
77 * echo "duration $DUR, slite time $(($DUR/$IC))"
78 * done
75 */79 */
76 80
77/*81/*

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t