# HG changeset patch # User koda # Date 1377605536 -7200 # Node ID 7a97a554ac806c10e5a832fb17a7eb8f0f5bca7c # Parent c6c7e68de2a4ee605c6028dea8300fa7c6adcec0 libavinteraction: fix typo and and compiling with modern libav diff -r c6c7e68de2a4 -r 7a97a554ac80 QTfrontend/util/LibavInteraction.cpp --- a/QTfrontend/util/LibavInteraction.cpp Sun Aug 25 22:32:06 2013 +0400 +++ b/QTfrontend/util/LibavInteraction.cpp Tue Aug 27 14:12:16 2013 +0200 @@ -30,6 +30,10 @@ #include "HWApplication.h" +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 25, 0) +#define CodecID AVCodecID +#endif + struct Codec { CodecID id; diff -r c6c7e68de2a4 -r 7a97a554ac80 QTfrontend/util/LibavInteraction.h --- a/QTfrontend/util/LibavInteraction.h Sun Aug 25 22:32:06 2013 +0400 +++ b/QTfrontend/util/LibavInteraction.h Tue Aug 27 14:12:16 2013 +0200 @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#ifndef LIBAV_ITERACTION -#define LIBAV_ITERACTION +#ifndef LIBAV_INTERACTION +#define LIBAV_INTERACTION #include @@ -48,4 +48,4 @@ QString getFileInfo(const QString & filepath); }; -#endif // LIBAV_ITERACTION +#endif // LIBAV_INTERACTION