From: John Törnblom <john@john-UX31E.(none)>
Date: Fri, 7 Jun 2013 11:11:09 +0000 (+0200)
Subject: libav: fixed compiling issues with more recent versions of libavcodec
X-Git-Tag: v3.9~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a9ccdd8bc488bc6e08d794b584a690802ed804f;p=thirdparty%2Ftvheadend.git

libav: fixed compiling issues with more recent versions of libavcodec
---

diff --git a/src/libav.c b/src/libav.c
index 7934c52e5..956016afc 100644
--- a/src/libav.c
+++ b/src/libav.c
@@ -140,6 +140,19 @@ codec_id2streaming_component_type(enum CodecID id)
 }
 
 
+/**
+ * 
+ */ 
+int
+libav_is_encoder(AVCodec *codec)
+{
+#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(7<<8)+0)
+  return av_codec_is_encoder(codec);
+#else
+  return codec->encode || codec->encode2;
+#endif
+}
+
 /**
  * 
  */ 
diff --git a/src/libav.h b/src/libav.h
index 98856f902..d34412d4c 100644
--- a/src/libav.h
+++ b/src/libav.h
@@ -25,6 +25,7 @@
 
 enum CodecID streaming_component_type2codec_id(streaming_component_type_t type);
 streaming_component_type_t codec_id2streaming_component_type(enum CodecID id);
+int libav_is_encoder(AVCodec *codec);
 void libav_init(void);
 
 #endif
diff --git a/src/plumbing/transcoding.c b/src/plumbing/transcoding.c
index 4cb48f67d..ea0af2035 100644
--- a/src/plumbing/transcoding.c
+++ b/src/plumbing/transcoding.c
@@ -1317,7 +1317,7 @@ transcoder_get_capabilities(htsmsg_t *array)
 
   while ((p = av_codec_next(p))) {
 
-    if (!p->encode && !p->encode2)
+    if (!libav_is_encoder(p))
       continue;
 
     if (!WORKING_ENCODER(p->id))