Fixed: 14.04 update_ffmpeg_3.0** Failed at make, result in /tmp/logbuildPlugi

[Jan Gruuthuse]

Fixed: 1c4c135    [plugin/ass] propagate changes

** Failed at make, result in /tmp/logbuildPluginsCommon**

ubuntu trusty 14.04.4 64-bit QT4
branch: update_ffmpeg_3.0.2

bb61eb9    [build] Fix new dependencies due to change in ADM_image

Code Select Expand

/home/jan/avidemux2/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp:384:44: error: invalid conversion from ââ,¬Ëœuint32_t* {aka unsigned int*}ââ,¬â,,¢ to ââ,¬Ëœint*ââ,¬â,,¢ [-fpermissive]
                   image->GetPitches(pitches);
                                            ^
In file included from /home/jan/avidemux2/avidemux_core/ADM_coreVideoFilter/include/ADM_coreVideoFilter.h:22:0,
                 from /home/jan/avidemux2/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp:17:
/home/jan/avidemux2/avidemux_core/ADM_coreImage/include/ADM_image.h:123:25: error:   initializing argument 1 of ââ,¬Ëœbool ADMImage::GetPitches(int*)ââ,¬â,,¢ [-fpermissive]
         bool            GetPitches(int *pitches);
                         ^
make[2]: *** [ADM_videoFilters6/ass/CMakeFiles/ADM_vf_ssa.dir/ADM_vidASS.cpp.o] Error 1
make[2]: Leaving directory `/home/jan/avidemux2/buildPluginsCommon'
make[1]: *** [ADM_videoFilters6/ass/CMakeFiles/ADM_vf_ssa.dir/all] Error 2

[Jan Gruuthuse]

Fixed: 1c4c135    [plugin/ass] propagate changes