Hi Alberto,
Thanks for the detective work. What I have gone for is:
#if LIBAVCODEC_VERSION_MAJOR >= 53 || \
(LIBAVCODEC_VERSION_MAJOR==52 && LIBAVCODEC_VERSION_MINOR>=49)
#include <pixdesc.h>
inline PixelFormat osg_av_get_pix_fmt(const char *name) { return
av_get_pix_fmt(name); }
#else
inline PixelFormat osg_av_get_pix_fmt(const char *name) { return
avcodec_get_pix_fmt(name); }
#endif
I have added this to the FFmpegParameters.cpp file. It's now checked
into svn/trunk. Could you please do an svn update and let me know how
you get on.
Cheers,
Robert.
On Fri, Jun 17, 2011 at 9:40 AM, Alberto Luaces <alua...@udc.es> wrote:
> Hi Robert,
>
> Robert Osfield writes:
>
>> HI Alberto,
>>
>> On Fri, Jun 17, 2011 at 9:15 AM, Alberto Luaces <alua...@udc.es> wrote:
>>> rev 12547 breaks the build when using ffmpeg 0.5.x (mine is
>>> 0.5.2-6). The pixdesc.h header doesn't exist and neither the function
>>> av_get_pix_fmt:
>>>
>>> src/osgPlugins/ffmpeg/FFmpegParameters.cpp:38: error: ‘av_get_pix_fmt’
>>> was not declared in this scope
>>>
>>> Reverting those changes makes the ffmpeg plugin build again.
>>
>> Darn it... fix a warning... break a build...
>>
>> We'll need to put in a check against the FFMpeg version and switch between
>> the old depercated method and the new one.
>>
>> What version do you have listed in your libavcodec/avcodec.h? The rev
>> I'm using is:
>>
>> #define LIBAVCODEC_VERSION_MAJOR 52
>> #define LIBAVCODEC_VERSION_MINOR 72
>> #define LIBAVCODEC_VERSION_MICRO 2
>>
>> I wonder which version the the new method was introduced, if we can
>> track this down we'll
>> be able to put in a lasting fix.
>
> Mine is
>
> #define LIBAVCODEC_VERSION_MAJOR 52
> #define LIBAVCODEC_VERSION_MINOR 20
> #define LIBAVCODEC_VERSION_MICRO 1
>
> According to
> http://web.archiveorange.com/archive/v/LGwh9c0DVRIJNr3IEtyE,
> av_get_pix_fmt was implemented in revision 21545 of ffmpeg, whose
> avcodec.h version was:
>
> $ svn cat -r 21545 svn://svn.ffmpeg.org/ffmpeg/trunk/libavcodec/avcodec.h |
> grep VERSION -m 3
> #define LIBAVCODEC_VERSION_MAJOR 52
> #define LIBAVCODEC_VERSION_MINOR 49
> #define LIBAVCODEC_VERSION_MICRO 0
>
> --
> Alberto
>
> _______________________________________________
> osg-users mailing list
> osg-users@lists.openscenegraph.org
> http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
>
_______________________________________________
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
