From 03a4547060883c6e8b47a73d0fad327b9ab5751c Mon Sep 17 00:00:00 2001
From: "Alfred E. Heggestad" <aeh@db.org>
Date: Mon, 16 May 2016 10:12:22 +0200
Subject: avcodec: build with older ffmpeg versions

Debian 6.0   (libavcodec 52.20.1)
Debian 7.9   (libavcodec 54.59.100)
---
 modules/avcodec/decode.c | 9 ++++++++-
 modules/avcodec/encode.c | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'modules/avcodec')

diff --git a/modules/avcodec/decode.c b/modules/avcodec/decode.c
index c7f0213..c686a63 100644
--- a/modules/avcodec/decode.c
+++ b/modules/avcodec/decode.c
@@ -7,14 +7,18 @@
 #include <rem.h>
 #include <baresip.h>
 #include <libavcodec/avcodec.h>
+#include <libavutil/avutil.h>
 #include <libavutil/mem.h>
+#if LIBAVCODEC_VERSION_INT >= ((53<<16)+(5<<8)+0)
 #include <libavutil/pixdesc.h>
+#endif
 #include "h26x.h"
 #include "avcodec.h"
 
 
 #if LIBAVUTIL_VERSION_MAJOR < 52
 #define AV_PIX_FMT_YUV420P PIX_FMT_YUV420P
+#define AV_PIX_FMT_YUVJ420P PIX_FMT_YUVJ420P
 #define AV_PIX_FMT_NV12    PIX_FMT_NV12
 #endif
 
@@ -175,6 +179,7 @@ static int ffdecode(struct viddec_state *st, struct vidframe *frame,
 
 	if (got_picture) {
 
+#if LIBAVCODEC_VERSION_INT >= ((53<<16)+(5<<8)+0)
 		switch (st->pict->format) {
 
 		case AV_PIX_FMT_YUV420P:
@@ -189,7 +194,9 @@ static int ffdecode(struct viddec_state *st, struct vidframe *frame,
 				av_get_pix_fmt_name(st->pict->format));
 			goto out;
 		}
-
+#else
+		frame->fmt = VID_FMT_YUV420P;
+#endif
 
 		for (i=0; i<4; i++) {
 			frame->data[i]     = st->pict->data[i];
diff --git a/modules/avcodec/encode.c b/modules/avcodec/encode.c
index 0ca635c..620b561 100644
--- a/modules/avcodec/encode.c
+++ b/modules/avcodec/encode.c
@@ -202,9 +202,11 @@ static int open_encoder(struct videnc_state *st,
 	}
 #endif
 
+#if LIBAVCODEC_VERSION_INT >= ((53<<16)+(5<<8)+0)
 	st->pict->format = pix_fmt;
 	st->pict->width = size->w;
 	st->pict->height = size->h;
+#endif
 
  out:
 	if (err) {
-- 
cgit v1.2.3