diff options
| author | Alfred E. Heggestad <aeh@db.org> | 2014-11-22 21:09:26 +0100 |
|---|---|---|
| committer | Alfred E. Heggestad <aeh@db.org> | 2014-11-22 21:09:26 +0100 |
| commit | 33db275dbe5846edc99cd6c0d6a1747cf7014766 (patch) | |
| tree | cbe513c370d88fa5ce114defce6d13adfa8ab2c6 /src | |
| parent | 918fb79b58c07c64731baf574b3bec2d57e96a1f (diff) | |
improve FFmpeg/libav module detection
- remove FFmpeg keyword, as both FFmpeg and libav is supported
- avcodec.so need libavcodec
- avformat.so needs libavformat and others
- also made the "quicktime.so" module deprecated
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/config.c b/src/config.c index 9cee3c6..f7ca5bb 100644 --- a/src/config.c +++ b/src/config.c @@ -592,7 +592,7 @@ int config_write_template(const char *file, const struct config *cfg) #ifdef USE_VIDEO (void)re_fprintf(f, "\n# Video codec Modules (in order)\n"); -#ifdef USE_FFMPEG +#ifdef USE_AVCODEC (void)re_fprintf(f, "module\t\t\t" MOD_PRE "avcodec" MOD_EXT "\n"); #else (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "avcodec" MOD_EXT "\n"); @@ -615,7 +615,7 @@ int config_write_template(const char *file, const struct config *cfg) (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "v4l" MOD_EXT "\n"); (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "v4l2" MOD_EXT "\n"); #endif -#ifdef USE_FFMPEG +#ifdef USE_AVFORMAT (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "avformat" MOD_EXT "\n"); #endif (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "x11grab" MOD_EXT "\n"); |