Merge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3'

[ffmpeg] / libavresample / utils.c

diff --git a/libavresample/utils.c b/libavresample/utils.c
index b79def92859c18b213966f1b14f6d05f2a3ef21f..c159e33206528701c5d4beea540942f04a42d29e 100644 (file)
--- a/libavresample/utils.c
+++ b/libavresample/utils.c
@@ -20,7 +20,7 @@
 
 #include "libavutil/common.h"
 #include "libavutil/dict.h"
-#include "libavutil/error.h"
+// #include "libavutil/error.h"
 #include "libavutil/log.h"
 #include "libavutil/mem.h"
 #include "libavutil/opt.h"
@@ -626,10 +626,10 @@ unsigned avresample_version(void)
 const char *avresample_license(void)
 {
 #define LICENSE_PREFIX "libavresample license: "
-    return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
 }
 
 const char *avresample_configuration(void)
 {
-    return LIBAV_CONFIGURATION;
+    return FFMPEG_CONFIGURATION;
 }