FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed img_convert usage

Browse Source
This commit is contained in:
Robert Osfield 2009-03-04 11:46:34 +00:00
parent 4ffef96874
commit d0dabd2665
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
View File

@ -5,19 +5,8 @@
#include <stdexcept>
#include <string.h>
#if 0
extern "C"
{
int img_convert(AVPicture *dst, int dst_pix_fmt, const AVPicture *src,
int src_pix_fmt, int src_width, int src_height);
};
#endif
namespace osgFFmpeg {
FFmpegDecoderVideo::FFmpegDecoderVideo(PacketQueue & packets, FFmpegClocks & clocks) :
m_packets(packets),
m_clocks(clocks),
@ -234,8 +223,8 @@ int FFmpegDecoderVideo::convert(AVPicture *dst, int dst_pix_fmt, const AVPicture
src->data, src->linesize, 0, src_height,
dst->data, dst->linesize);
#else
return convert(dst, dst_pix_fmt, src,
src_pix_fmt, src_width, src_height)
return im_convert(dst, dst_pix_fmt, src,
src_pix_fmt, src_width, src_height)
#endif
}

2
src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
View File

@ -122,7 +122,7 @@ private:
volatile bool m_exit;
#if USE_SWSCALE
#ifdef USE_SWSCALE
struct SwsContext * m_swscale_ctx;
#endif
};