diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-08-02 12:54:35 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-08-02 12:54:35 +0400 |
| commit | c5d184664fec4340b57082cd1cc31220d9f1220b (patch) | |
| tree | 34c6103e95b6538a8e71d1ba87897536b7b51015 /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/imgconvert.h | |
| parent | aef6f86e8400fa5ee1e9d9ddc6190412ef09e519 (diff) | |
updated ffmpeg (thanks to Aleksoid for finding the conflict in avcore\utils.c for Debug VS2010 builds)
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2180 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/imgconvert.h')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/imgconvert.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/imgconvert.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/imgconvert.h index 48e2f1271..f09fcbfc0 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/imgconvert.h +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/imgconvert.h @@ -27,9 +27,13 @@ #include <stdint.h> #include "avcodec.h" +#if LIBAVCODEC_VERSION_MAJOR < 53 +attribute_deprecated int ff_fill_linesize(AVPicture *picture, enum PixelFormat pix_fmt, int width); +attribute_deprecated int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, enum PixelFormat pix_fmt, int height); +#endif int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane); |