From 50842b90363efbe2ec16c899a0295cdab9f5ea85 Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Thu, 7 May 2015 11:38:59 +0000 Subject: [PATCH] get code to compile on Ubuntu Saucy A define was forgotten for the codecs and there was a typo for another. (cherry picked from commit f052b0bc4d2619daafe5c56d91fc4a6cb00b8b7c) Conflicts: modules/videoio/src/ffmpeg_codecs.hpp --- modules/highgui/src/ffmpeg_codecs.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/highgui/src/ffmpeg_codecs.hpp b/modules/highgui/src/ffmpeg_codecs.hpp index 4059a3f44..695d17409 100644 --- a/modules/highgui/src/ffmpeg_codecs.hpp +++ b/modules/highgui/src/ffmpeg_codecs.hpp @@ -104,6 +104,7 @@ typedef struct AVCodecTag { #define AV_CODEC_ID_H264 CODEC_ID_H264 #define AV_CODEC_ID_H263 CODEC_ID_H263 #define AV_CODEC_ID_H263P CODEC_ID_H263P +#define AV_CODEC_ID_H263I CODEC_ID_H263I #define AV_CODEC_ID_H261 CODEC_ID_H261 #define AV_CODEC_ID_MPEG4 CODEC_ID_MPEG4 #define AV_CODEC_ID_MSMPEG4V3 CODEC_ID_MSMPEG4V3 @@ -144,7 +145,7 @@ typedef struct AVCodecTag { #define AV_CODEC_ID_WMV3 CODEC_ID_WMV3 #define AV_CODEC_ID_LOCO CODEC_ID_LOCO #define AV_CODEC_ID_THEORA CODEC_ID_THEORA -#define AV_CODEC_ID_WNV CODEC_ID_WNV +#define AV_CODEC_ID_WNV1 CODEC_ID_WNV1 #define AV_CODEC_ID_AASC CODEC_ID_AASC #define AV_CODEC_ID_INDEO2 CODEC_ID_INDEO2 #define AV_CODEC_ID_FRAPS CODEC_ID_FRAPS