diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-10-30 17:59:01 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-11-02 10:42:54 +0100 |
| commit | 20566eb0f0e3b0f538bcf68fca42e67afaa0dec6 (patch) | |
| tree | d06fd70d43d1d8ad060f36c02861579ffdca5bfd /libavformat | |
| parent | 124e28847b95a70724399c8473dd778b5c4c8ffc (diff) | |
| download | ffmpeg-20566eb0f0e3b0f538bcf68fca42e67afaa0dec6.tar.gz | |
Replace outdated references to ffmpeg tool with avconv.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/cutils.c | 2 | ||||
| -rw-r--r-- | libavformat/http.c | 4 | ||||
| -rw-r--r-- | libavformat/movenc.h | 2 | ||||
| -rw-r--r-- | libavformat/nsvdec.c | 6 |
4 files changed, 9 insertions, 5 deletions
diff --git a/libavformat/cutils.c b/libavformat/cutils.c index 092aa8a1a9..f94442f1bd 100644 --- a/libavformat/cutils.c +++ b/libavformat/cutils.c @@ -24,7 +24,7 @@ /* add one element to a dynamic array */ void ff_dynarray_add(intptr_t **tab_ptr, int *nb_ptr, intptr_t elem) { - /* see similar ffmpeg.c:grow_array() */ + /* see similar avconv.c:grow_array() */ int nb, nb_alloc; intptr_t *tab; diff --git a/libavformat/http.c b/libavformat/http.c index 10ec70fedd..1db9e82cc4 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1,5 +1,5 @@ /* - * HTTP protocol for ffmpeg client + * HTTP protocol for avconv client * Copyright (c) 2000, 2001 Fabrice Bellard * * This file is part of Libav. @@ -31,7 +31,7 @@ #include "url.h" #include "libavutil/opt.h" -/* XXX: POST protocol is not completely implemented because ffmpeg uses +/* XXX: POST protocol is not completely implemented because avconv uses only a subset of it. */ /* used for protocol handling */ diff --git a/libavformat/movenc.h b/libavformat/movenc.h index 39cdb39284..bddae459da 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -35,7 +35,7 @@ #define MODE_MOV 0x02 #define MODE_3GP 0x04 #define MODE_PSP 0x08 // example working PSP command line: -// ffmpeg -i testinput.avi -f psp -r 14.985 -s 320x240 -b 768 -ar 24000 -ab 32 M4V00001.MP4 +// avconv -i testinput.avi -f psp -r 14.985 -s 320x240 -b 768 -ar 24000 -ab 32 M4V00001.MP4 #define MODE_3G2 0x10 #define MODE_IPOD 0x20 diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index 84957c6a7a..d0fac9afb0 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -71,7 +71,11 @@ * so the header seems to not be mandatory. (for streaming). * * index slice duration check (excepts nsvtrailer.nsv): - * 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))"; done + * for f in [^n]*.nsv; do + * DUR="$(avconv -i "$f" 2> /dev/null | grep 'NSVf duration' | cut -d ' ' -f 4)" + * IC="$(avconv -i "$f" 2> /dev/null | grep 'INDEX ENTRIES' | cut -d ' ' -f 2)" + * echo "duration $DUR, slite time $(($DUR/$IC))" + * done */ /* |