Bug#739459: FTBFS with libav10

[anton]

Hi,
the attached patch should fix this bug

-- 
Anton Khirnov
Index: xpra-0.11.3+dfsg/xpra/codecs/dec_avcodec/decoder.pyx
===================================================================
--- xpra-0.11.3+dfsg.orig/xpra/codecs/dec_avcodec/decoder.pyx	2014-02-23 13:42:32.000000000 +0000
+++ xpra-0.11.3+dfsg/xpra/codecs/dec_avcodec/decoder.pyx	2014-02-23 13:43:02.400818781 +0000
@@ -88,9 +88,9 @@
         int flags2
 
     AVPixelFormat PIX_FMT_NONE
-    AVCodecID CODEC_ID_H264
-    AVCodecID CODEC_ID_VP8
-    #AVCodecID CODEC_ID_VP9
+    AVCodecID AV_CODEC_ID_H264
+    AVCodecID AV_CODEC_ID_VP8
+    #AVCodecID AV_CODEC_ID_VP9
 
     #init and free:
     void avcodec_register_all()
@@ -165,11 +165,11 @@
     if CODECS is None:
         avcodec_register_all()
         CODECS = []
-        if avcodec_find_decoder(CODEC_ID_H264)!=NULL:
+        if avcodec_find_decoder(AV_CODEC_ID_H264)!=NULL:
             CODECS.append("h264")
-        if avcodec_find_decoder(CODEC_ID_VP8)!=NULL:
+        if avcodec_find_decoder(AV_CODEC_ID_VP8)!=NULL:
             CODECS.append("vp8")
-        #if avcodec_find_decoder(CODEC_ID_VP9)!=NULL:
+        #if avcodec_find_decoder(AV_CODEC_ID_VP9)!=NULL:
         #    CODECS.append("vp9")
     return CODECS
 
@@ -376,13 +376,13 @@
         avcodec_register_all()
 
         if self.encoding=="h264":
-            self.codec = avcodec_find_decoder(CODEC_ID_H264)
+            self.codec = avcodec_find_decoder(AV_CODEC_ID_H264)
             if self.codec==NULL:
                 error("codec H264 not found!")
                 return  False
         else:
             assert self.encoding=="vp8"
-            self.codec = avcodec_find_decoder(CODEC_ID_VP8)
+            self.codec = avcodec_find_decoder(AV_CODEC_ID_VP8)
             if self.codec==NULL:
                 error("codec VP8 not found!")
                 return  False