From c547172c24db3fba9e2d431a22d509ed79c2ddd9 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 17 Jun 2011 06:22:01 +0000 Subject: [PATCH] Fixed warning --- src/osgPlugins/ffmpeg/FFmpegHeaders.hpp | 1 + src/osgPlugins/ffmpeg/FFmpegParameters.cpp | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp b/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp index 2050ad12e..749ccc365 100644 --- a/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp +++ b/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp @@ -12,6 +12,7 @@ extern "C" #include #include #include +#include #ifdef USE_SWSCALE #include diff --git a/src/osgPlugins/ffmpeg/FFmpegParameters.cpp b/src/osgPlugins/ffmpeg/FFmpegParameters.cpp index b64e0315c..95bbab1ee 100644 --- a/src/osgPlugins/ffmpeg/FFmpegParameters.cpp +++ b/src/osgPlugins/ffmpeg/FFmpegParameters.cpp @@ -5,8 +5,6 @@ #include #include - - namespace osgFFmpeg { @@ -37,7 +35,7 @@ void FFmpegParameters::parse(const std::string& name, const std::string& value) } else if (name == "pixel_format") { - m_parameters.pix_fmt = avcodec_get_pix_fmt(value.c_str()); + m_parameters.pix_fmt = av_get_pix_fmt(value.c_str()); } else if (name == "frame_size") {