mirror of https://git.videolan.org/git/ffmpeg.git
Read preset files with suffix .avpreset
The preset files have been renamed some time ago. CC: libav-stable@libav.org
This commit is contained in:
parent
6acac061ab
commit
050dc12778
|
@ -872,12 +872,12 @@ FILE *get_preset_file(char *filename, size_t filename_size,
|
||||||
for (i = 0; i < 3 && !f; i++) {
|
for (i = 0; i < 3 && !f; i++) {
|
||||||
if (!base[i])
|
if (!base[i])
|
||||||
continue;
|
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);
|
i != 1 ? "" : "/.avconv", preset_name);
|
||||||
f = fopen(filename, "r");
|
f = fopen(filename, "r");
|
||||||
if (!f && codec_name) {
|
if (!f && codec_name) {
|
||||||
snprintf(filename, filename_size,
|
snprintf(filename, filename_size,
|
||||||
"%s%s/%s-%s.ffpreset",
|
"%s%s/%s-%s.avpreset",
|
||||||
base[i], i != 1 ? "" : "/.avconv", codec_name,
|
base[i], i != 1 ? "" : "/.avconv", codec_name,
|
||||||
preset_name);
|
preset_name);
|
||||||
f = fopen(filename, "r");
|
f = fopen(filename, "r");
|
||||||
|
|
|
@ -351,11 +351,11 @@ int64_t guess_correct_pts(PtsCorrectionContext *ctx, int64_t pts, int64_t dts);
|
||||||
* Get a file corresponding to a preset file.
|
* Get a file corresponding to a preset file.
|
||||||
*
|
*
|
||||||
* If is_path is non-zero, look for the file in the path preset_name.
|
* 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
|
* $AVCONV_DATADIR (if set), $HOME/.avconv, and in the datadir defined
|
||||||
* at configuration time, in that order. If no such file is found and
|
* 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 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 buffer where the name of the found filename is written
|
||||||
* @param filename_size size in bytes of the filename buffer
|
* @param filename_size size in bytes of the filename buffer
|
||||||
|
|
Loading…
Reference in New Issue