diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 02:40:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 02:40:00 +0200 |
| commit | 7f1543d46cd88e86bd662695d79c16c93892223e (patch) | |
| tree | 8e43cb545773b309b507afaaee1aeed8348dfd1d /configure | |
| parent | c7168d1a22a67d908a556c2e1a4131932006fa22 (diff) | |
| parent | b396bbad100a7493691d09b8dceba91e3cd28e2e (diff) | |
| download | ffmpeg-7f1543d46cd88e86bd662695d79c16c93892223e.tar.gz | |
Merge commit 'b396bbad100a7493691d09b8dceba91e3cd28e2e'
* commit 'b396bbad100a7493691d09b8dceba91e3cd28e2e':
configure: Do not add extralibs to avresample .pc file
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -5627,6 +5627,6 @@ pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVF pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" pkgconfig_generate libavfilter "FFmpeg audio/video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" -pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs" +pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$LIBM" pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" pkgconfig_generate libswresample "FFmpeg audio resampling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" |