I don't think this fix can be correct. On my system (Fedora 17), both
AV_OPT_TYPE_INT and FF_OPT_TYPE_INT are defined as distinct values of the
enum AVOptionType in libavutil/opt.h. Thus adding this #define before
including opt.h causes an error: redeclaration of enumerator
'FF_OPT_TYPE_INT'

The purpose of the #defines in LiVES is to define AV_OPT_TYPE_INT on older
versions of libavutil which did not have AV_OPT_TYPE_INT.

It seems the problem in Sid is due to Debian's use of libavutils from libav
rather than from ffmpeg.

I believe the correct fix may be the following (which I hope will work in
all cases):

- #ifndef AV_OPT_TYPE_INT
+ #if FF_API_OLD_AVOPTIONS

leaving the lines in the same place as the original.




Regards
Salsaman.

http://lives.sourceforge.net
https://www.ohloh.net/accounts/salsaman

Reply via email to