diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2012-03-18 09:26:32 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-04-29 22:07:01 +0200 |
| commit | ec554ee747c966ff173551ee89fe71e19c2aeb6c (patch) | |
| tree | 62ab381261880a20e07d19f1e551088063b4c217 | |
| parent | bf3998d71efa7a9a6acc6d7d81dd674249e074c1 (diff) | |
| download | ffmpeg-ec554ee747c966ff173551ee89fe71e19c2aeb6c.tar.gz | |
Read preset files with suffix .avpreset
The preset files have been renamed some time ago.
CC: libav-stable@libav.org
(cherry picked from commit 050dc127787e91d8ee4b341046c74fe6e74e3285)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | cmdutils.c | 4 | ||||
| -rw-r--r-- | cmdutils.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmdutils.c b/cmdutils.c index a489a0f06e..e96fa81ad9 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -883,12 +883,12 @@ FILE *get_preset_file(char *filename, size_t filename_size, for (i = 0; i < 3 && !f; i++) { if (!base[i]) continue; - snprintf(filename, filename_size, "%s%s/%s.ffpreset", base[i], + snprintf(filename, filename_size, "%s%s/%s.avpreset", base[i], i != 1 ? "" : "/.avconv", preset_name); f = fopen(filename, "r"); if (!f && codec_name) { snprintf(filename, filename_size, - "%s%s/%s-%s.ffpreset", + "%s%s/%s-%s.avpreset", base[i], i != 1 ? "" : "/.avconv", codec_name, preset_name); f = fopen(filename, "r"); diff --git a/cmdutils.h b/cmdutils.h index eb96645eed..c69bb02cea 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -345,11 +345,11 @@ int64_t guess_correct_pts(PtsCorrectionContext *ctx, int64_t pts, int64_t dts); * Get a file corresponding to a preset file. * * If is_path is non-zero, look for the file in the path preset_name. - * Otherwise search for a file named arg.ffpreset in the directories + * Otherwise search for a file named arg.avpreset in the directories * $AVCONV_DATADIR (if set), $HOME/.avconv, and in the datadir defined * at configuration time, in that order. If no such file is found and * codec_name is defined, then search for a file named - * codec_name-preset_name.ffpreset in the above-mentioned directories. + * codec_name-preset_name.avpreset in the above-mentioned directories. * * @param filename buffer where the name of the found filename is written * @param filename_size size in bytes of the filename buffer |