Bug#327429: FTBFS: Incompatible with recent libavcodec-dev

[Matt Kraai]

Package: lynkeos.app
Version: 1.2-1
Severity: serious
Tags: patch

lynkeos.app fails to build because it is incompatible with recent
versions of libavcodec-dev:

>  Compiling file ffmpeg_access.c ...
> ffmpeg_access.c: In function 'ffmpegLoadMovie':
> ffmpeg_access.c:243: error: request for member 'codec_type' in something not 
> a structure or union
> ffmpeg_access.c:258: warning: assignment from incompatible pointer type
> ffmpeg_access.c:289: error: 'struct AVCodecContext' has no member named 
> 'frame_rate'
> ffmpeg_access.c:289: error: 'struct AVCodecContext' has no member named 
> 'frame_rate_base'
> ffmpeg_access.c:290: error: 'struct AVCodecContext' has no member named 
> 'frame_rate_base'
> ffmpeg_access.c:301: warning: incompatible implicit declaration of built-in 
> function 'malloc'

The attached patch fixes these incompatibilities.

-- 
Matt

diff -u lynkeos.app-1.2/Sources/GNUmakefile lynkeos.app-1.2/Sources/GNUmakefile
--- lynkeos.app-1.2/Sources/GNUmakefile
+++ lynkeos.app-1.2/Sources/GNUmakefile
@@ -39,7 +39,7 @@
 
 Lynkeos_APPLICATION_ICON=Lynkeos.png
 
-ADDITIONAL_OBJC_LIBS += -lavformat -lavcodec -ldts -lfftw3f_threads 
-lfftw3_threads -lfftw3f -lfftw3 -lm
+ADDITIONAL_OBJC_LIBS += -lavformat -lavcodec -lavutil -lfftw3f_threads 
-lfftw3_threads -lfftw3f -lfftw3 -lvorbis -lvorbisenc -ltheora -logg -ldts 
-la52 -lraw1394 -ldc1394_control -lgsm -lz -lm
 #ADDITIONAL_LIB_DIRS += -L/home/thecat/Devel/ffmpeg-0.4.8/libavformat/ 
-L/home/thecat/Devel/ffmpeg-0.4.8/libavcodec
 
 ADDITIONAL_CPPFLAGS += -DFLOAT_PIXELS
only in patch2:
unchanged:
--- lynkeos.app-1.2.orig/Sources/ffmpeg_access.c
+++ lynkeos.app-1.2/Sources/ffmpeg_access.c
@@ -240,7 +240,7 @@
     // Find the first video stream
     videoStream=-1;
     for(i=0; i<pFormatCtx->nb_streams; i++)
-        if(pFormatCtx->streams[i]->codec.codec_type==CODEC_TYPE_VIDEO)
+        if(pFormatCtx->streams[i]->codec->codec_type==CODEC_TYPE_VIDEO)
         {
             videoStream=i;
             break;
@@ -284,12 +284,6 @@
       return _ffmpegErrorOccuredFlag;
     }
 
-    // Hack to correct wrong frame rates that seem to be generated by some 
-    // codecs
-    if(pCodecCtx->frame_rate>1000 && pCodecCtx->frame_rate_base==1){
-        pCodecCtx->frame_rate_base=1000;
-    }
-
     // Allocate video frame
     pFrame=avcodec_alloc_frame();
 

signature.asc
Description: Digital signature