[FFmpeg-devel] [PATCH] ffmpeg: fix wrong references to avconv names in get_preset_file_2()

[Stefano Sabatini]

Consistent with the docs.
---
 ffmpeg.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index a29dc98..5b1ce45 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3775,22 +3775,22 @@ static int get_preset_file_2(const char *preset_name, const char *codec_name, AV
 {
     int i, ret = 1;
     char filename[1000];
-    const char *base[3] = { getenv("AVCONV_DATADIR"),
+    const char *base[3] = { getenv("FFMPEG_DATADIR"),
                             getenv("HOME"),
-                            AVCONV_DATADIR,
+                            FFMPEG_DATADIR,
                             };
 
     for (i = 0; i < FF_ARRAY_ELEMS(base) && ret; i++) {
         if (!base[i])
             continue;
         if (codec_name) {
-            snprintf(filename, sizeof(filename), "%s%s/%s-%s.avpreset", base[i],
-                     i != 1 ? "" : "/.avconv", codec_name, preset_name);
+            snprintf(filename, sizeof(filename), "%s%s/%s-%s.ffpreset", base[i],
+                     i != 1 ? "" : "/.ffmpeg", codec_name, preset_name);
             ret = avio_open2(s, filename, AVIO_FLAG_READ, &int_cb, NULL);
         }
         if (ret) {
-            snprintf(filename, sizeof(filename), "%s%s/%s.avpreset", base[i],
-                     i != 1 ? "" : "/.avconv", preset_name);
+            snprintf(filename, sizeof(filename), "%s%s/%s.ffpreset", base[i],
+                     i != 1 ? "" : "/.ffmpeg", preset_name);
             ret = avio_open2(s, filename, AVIO_FLAG_READ, &int_cb, NULL);
         }
     }
-- 
1.7.5.4