Commit 4f13e733 authored by Måns Rullgård's avatar Måns Rullgård

avoid deprecation warnings for ImgReSampleContext from avcodec.h

Originally committed as revision 9568 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent b776e3d1
...@@ -2220,11 +2220,6 @@ void av_resample_close(struct AVResampleContext *c); ...@@ -2220,11 +2220,6 @@ void av_resample_close(struct AVResampleContext *c);
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
/* YUV420 format is assumed ! */ /* YUV420 format is assumed ! */
/**
* @deprecated Use the software scaler (swscale) instead.
*/
struct ImgReSampleContext attribute_deprecated;
/** /**
* @deprecated Use the software scaler (swscale) instead. * @deprecated Use the software scaler (swscale) instead.
*/ */
...@@ -2249,13 +2244,13 @@ attribute_deprecated ImgReSampleContext *img_resample_full_init(int owidth, int ...@@ -2249,13 +2244,13 @@ attribute_deprecated ImgReSampleContext *img_resample_full_init(int owidth, int
/** /**
* @deprecated Use the software scaler (swscale) instead. * @deprecated Use the software scaler (swscale) instead.
*/ */
attribute_deprecated void img_resample(ImgReSampleContext *s, attribute_deprecated void img_resample(struct ImgReSampleContext *s,
AVPicture *output, const AVPicture *input); AVPicture *output, const AVPicture *input);
/** /**
* @deprecated Use the software scaler (swscale) instead. * @deprecated Use the software scaler (swscale) instead.
*/ */
attribute_deprecated void img_resample_close(ImgReSampleContext *s); attribute_deprecated void img_resample_close(struct ImgReSampleContext *s);
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment