diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-03-03 08:23:08 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-03 21:11:48 +0100 |
| commit | 2cffe38df3df8ee1ec0fea0b2a2d3fed6e75da0d (patch) | |
| tree | dab880ca9080ed4e999efaef60a4ca54293b1be3 /libavcodec | |
| parent | 9af8179cdb5eb05e9b29b0a4d0c363d22b674e95 (diff) | |
| download | ffmpeg-2cffe38df3df8ee1ec0fea0b2a2d3fed6e75da0d.tar.gz | |
Deprecate deinterlaced in libavcodec.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 3 | ||||
| -rw-r--r-- | libavcodec/imgconvert.c | 4 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f809e3de7f..c27a603a9b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -4618,7 +4618,10 @@ int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height); /** * deinterlace - if not supported return -1 + * + * @deprecated - use yadif (in lavfilter) instead */ +attribute_deprecated int avpicture_deinterlace(AVPicture *dst, const AVPicture *src, enum AVPixelFormat pix_fmt, int width, int height); /** diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 7b5be5ccd2..6c3bb368ec 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -492,6 +492,8 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, return 0; } +#if FF_API_DEINTERLACE + #if !HAVE_MMX_EXTERNAL /* filter parameters: [-1 4 2 4 -1] // 8 */ static void deinterlace_line_c(uint8_t *dst, @@ -651,6 +653,8 @@ int avpicture_deinterlace(AVPicture *dst, const AVPicture *src, return 0; } +#endif /* FF_API_DEINTERLACE */ + #ifdef TEST int main(void){ diff --git a/libavcodec/version.h b/libavcodec/version.h index dceeaa47e5..f2cc5d19e2 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -106,5 +106,8 @@ #ifndef FF_API_IDCT #define FF_API_IDCT (LIBAVCODEC_VERSION_MAJOR < 55) #endif +#ifndef FF_API_DEINTERLACE +#define FF_API_DEINTERLACE (LIBAVCODEC_VERSION_MAJOR < 55) +#endif #endif /* AVCODEC_VERSION_H */ |