From b2f83543d6da2447168208de77bd7d0d2252d8c5 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Fri, 21 Feb 2014 15:40:24 +0100
Subject: [PATCH] Revert fixes on Ubuntu 10.04 in order to accomodate ffmpeg >=
0.6
---
xbob/io/externals.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/xbob/io/externals.cpp b/xbob/io/externals.cpp
index 3cdbe48..f47294a 100644
--- a/xbob/io/externals.cpp
+++ b/xbob/io/externals.cpp
@@ -45,6 +45,10 @@ extern "C" {
#if WITH_FFMPEG
# include <libavformat/avformat.h>
# include <libavcodec/avcodec.h>
+# if LIBAVUTIL_VERSION_INT >= 0x320f01 //50.15.1 @ ffmpeg-0.6
+# include <libavutil/opt.h>
+# include <libavutil/pixdesc.h>
+# endif
# include <libavutil/avutil.h>
# include <libswscale/swscale.h>
# if !HAVE_FFMPEG_AVCODEC_AVCODECID
--
GitLab