Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
libavinteraction: fix typo and and compiling with modern libav
authorkoda
Tue, 27 Aug 2013 14:12:16 +0200
changeset 9429 7a97a554ac80
parent 9427 c6c7e68de2a4
child 9431 0f5961910e27
libavinteraction: fix typo and and compiling with modern libav
QTfrontend/util/LibavInteraction.cpp file | annotate | diff | comparison | revisions
QTfrontend/util/LibavInteraction.h file | annotate | diff | comparison | revisions 
--- 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;
--- 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 <QComboBox>
 
@@ -48,4 +48,4 @@
     QString getFileInfo(const QString & filepath);
 };
 
-#endif // LIBAV_ITERACTION
+#endif // LIBAV_INTERACTION
hedgewars