diff -r 00696c1450da -r 7ac83d79b897 QTfrontend/util/libav_iteraction.cpp --- a/QTfrontend/util/libav_iteraction.cpp Wed Oct 24 13:21:18 2012 +0100 +++ b/QTfrontend/util/libav_iteraction.cpp Wed Oct 24 14:55:31 2012 +0100 @@ -19,7 +19,6 @@ #include "libav_iteraction.h" #if VIDEOREC -#define __STDC_CONSTANT_MACROS extern "C" { #include "libavformat/avformat.h" @@ -271,7 +270,7 @@ QByteArray utf8path = filepath.toUtf8(); if (avformat_open_input(&pContext, utf8path.data(), NULL, NULL) < 0) return ""; -#if LIBAFORMAT_VERSION_MAJOR < 54 +#if LIBAVFORMAT_VERSION_MAJOR < 54 if (av_find_stream_info(pContext) < 0) #else if (avformat_find_stream_info(pContext, NULL) < 0) @@ -309,7 +308,7 @@ AVDictionaryEntry* pComment = av_dict_get(pContext->metadata, "comment", NULL, 0); if (pComment) desc += QString("\n") + pComment->value; -#if LIBAFORMAT_VERSION_MAJOR < 54 +#if LIBAVFORMAT_VERSION_MAJOR < 54 av_close_input_file(pContext); #else avformat_close_input(&pContext);