diff options
| author | wm4 <wm4@nowhere> | 2014-03-13 00:29:17 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-03-13 00:29:17 +0100 |
| commit | 3bc78a84cd776387fbbfe120cdfaa5b56d329c61 (patch) | |
| tree | da28a0812d81442532ba76fcd66adddded19456b /old-configure | |
| parent | 1a86322dcaed46cdae89c8a53ae3fbe8dbc85968 (diff) | |
| download | mpv-3bc78a84cd776387fbbfe120cdfaa5b56d329c61.tar.bz2 mpv-3bc78a84cd776387fbbfe120cdfaa5b56d329c61.tar.xz | |
af_lavfi: beat it into working with Libav
The main incompatibility was that Libav didn't have av_opt_set_int_list.
But since that function is excessively ugly and idiotic (look how it
handles types), I'm not missing it much. Use an aformat filter instead
to handle the functionality that was indirectly provided by it. This is
similar to how vf_lavfi works.
The other incompatibility was channel handling. Libav consistently uses
channel layouts only, why ffmpeg still requires messing with channel
counts to some degree. Get rid of most channel count uses (and hope
channel layouts are "exact" enough). Only in one case FFmpeg fails with
a runtime check if we feed it AVFrames with channel count unset.
Another issue were AVFrame accessor functions. FFmpeg introduced these
for ABI compatibility with Libav. I refuse to use them, and it's not my
problem if FFmpeg doesn't manage to provide a stable ABI for fields
provided both by FFmpeg and Libav.
Diffstat (limited to 'old-configure')
| -rwxr-xr-x | old-configure | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/old-configure b/old-configure index 42897f3c15..06f9ee16e1 100755 --- a/old-configure +++ b/old-configure @@ -2831,21 +2831,11 @@ fi echores "$vf_lavfi" -echocheck "libavutil av_opt_set_int_list() API" -_avutil_has_opt_set_int_list=no -statement_check libavutil/opt.h 'av_opt_set_int_list(0,0,(int*)0,0,0)' && _avutil_has_opt_set_int_list=yes -echores "$_avutil_has_opt_set_int_list" - - echocheck "using libavfilter through af_lavfi" if test "$af_lavfi" = auto ; then af_lavfi=no if test "$libavfilter" = yes ; then - if test "$_avutil_has_opt_set_int_list" = no ; then - res_comment="libavutil too old" - else - af_lavfi=yes - fi + af_lavfi=yes fi fi if test "$af_lavfi" = yes ; then |