vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Tue Apr 14 19:25:07 2020 +0300| [067dcd0a1974b00a92e900b0e5c976349ad13859] | committer: Rémi Denis-Courmont
avcodec: fix flawed logic Cannot find any codec. Regression from 21d5a1933275edb7f67d05ea62a762464e07c2cb. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=067dcd0a1974b00a92e900b0e5c976349ad13859 --- modules/codec/avcodec/avcommon.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/codec/avcodec/avcommon.h b/modules/codec/avcodec/avcommon.h index fa06616433..6d88f12d72 100644 --- a/modules/codec/avcodec/avcommon.h +++ b/modules/codec/avcodec/avcommon.h @@ -118,7 +118,7 @@ static inline void vlc_init_avformat(vlc_object_t *obj) avformat_network_init(); -#if (LIBAVFORMAT_VERSION_MICRO >= 100) && (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 9, 100)) +#if (LIBAVFORMAT_VERSION_MICRO < 100) || (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 9, 100)) av_register_all(); #endif @@ -135,7 +135,7 @@ static inline void vlc_init_avcodec(vlc_object_t *obj) vlc_init_avutil(obj); -#if (LIBAVFORMAT_VERSION_MICRO >= 100) && (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100)) +#if (LIBAVFORMAT_VERSION_MICRO < 100) || (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100)) avcodec_register_all(); #endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
