Thanks Ulrich, changes now merged and submitted to svn/trunk.
On Tue, Mar 24, 2009 at 3:02 AM, Ulrich Hertlein <[email protected]>wrote:
> On 24/3/09 2:44 AM, Robert Osfield wrote:
>
>> Thanks David, changes look sensible, I've tested then against ffmpeg
>> installed from Ubuntu repositories and svn/trunk of ffmpeg and both
>> are picked up fine. Fingers crossed things will continue working
>> fine under other platforms as well.
>>
>
> I got the following type error from gcc 4.0.1 on OS X 10.5.6:
> /Users/uli/Projects/osg/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp:
> In member function ‘int osgFFmpeg::FFmpegDecoderVideo::convert(AVPicture*,
> int, AVPicture*, int, int, int)’:
> /Users/uli/Projects/osg/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp:245:
> error: invalid conversion from ‘int’ to ‘PixelFormat’
> /Users/uli/Projects/osg/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp:245:
> error: initializing argument 3 of ‘SwsContext* sws_getContext(int, int,
> PixelFormat, int, int, PixelFormat, int, SwsFilter*, SwsFilter*, double*)’
>
> It expects 'src_pix_fmt' and 'dst_pix_fmt' to be of type 'PixelFormat'
> rather than int. The attached cast fixes this (for me).
>
> I've also added Matroska video to the list of supported extensions:
>
> Index: ../src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
> ===================================================================
> --- ../src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp (revision 9964)
> +++ ../src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp (working copy)
> @@ -240,8 +240,8 @@
> #ifdef USE_SWSCALE
> if (m_swscale_ctx==0)
> {
> - m_swscale_ctx = sws_getContext(src_width, src_height, src_pix_fmt,
> - src_width, src_height, dst_pix_fmt,
> + m_swscale_ctx = sws_getContext(src_width, src_height,
> (PixelFormat) src_pix_fmt,
> + src_width, src_height, (PixelFormat)
> dst_pix_fmt,
> /*SWS_BILINEAR*/ SWS_BICUBIC, NULL,
> NULL, NULL);
> }
>
> Index: ../src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp
> ===================================================================
> --- ../src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp (revision 9964)
> +++ ../src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp (working copy)
> @@ -36,7 +36,8 @@
> supportsExtension("ogg", "Theora movie format");
> supportsExtension("mpg", "Mpeg movie format");
> supportsExtension("mpv", "Mpeg movie format");
> - supportsExtension("wmv", "");
> + supportsExtension("wmv", "Windows Media Video format");
> + supportsExtension("mkv", "Matroska");
>
> // Register all FFmpeg formats/codecs
> av_register_all();
>
> Cheers,
> /ulrich
>
> _______________________________________________
> osg-submissions mailing list
> [email protected]
>
> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
>
>
_______________________________________________
osg-submissions mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
