diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-07 11:50:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-07 11:50:17 +0100 |
| commit | 8cc5481d51bf746d9d43348af711dbf201bf336a (patch) | |
| tree | 0a4102445621aecf2e34d8a6ee853e97d73525eb /libavcodec/avcodec.h | |
| parent | 47f1af47b6cb763452c5bab3704ca965fccad25b (diff) | |
| parent | 54b298fe5650c124c29a8283cfd05024ac409d3a (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: Deprecate the deinterlace functions in libavcodec
h264: Integrate draw_horiz_band into ff_h264_draw_horiz_band
Conflicts:
configure
ffmpeg_opt.c
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/imgconvert.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c27a603a9b..c4db4d761f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -4616,14 +4616,16 @@ int avpicture_layout(const AVPicture* src, enum AVPixelFormat pix_fmt, */ int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height); +#if FF_API_DEINTERLACE /** * deinterlace - if not supported return -1 * - * @deprecated - use yadif (in lavfilter) instead + * @deprecated - use yadif (in libavfilter) instead */ attribute_deprecated int avpicture_deinterlace(AVPicture *dst, const AVPicture *src, enum AVPixelFormat pix_fmt, int width, int height); +#endif /** * Copy image src to dst. Wraps av_image_copy(). */ |