summaryrefslogtreecommitdiffstats
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorPanagiotis Issaris <takis.issaris@uhasselt.be>2007-03-04 11:53:11 +0000
committerPanagiotis Issaris <takis.issaris@uhasselt.be>2007-03-04 11:53:11 +0000
commit636d6a4a472d756cfb0ee845249e1e4f303e2134 (patch)
tree9ee1413732cf401c2aebad226563876cac482069 /libavcodec/avcodec.h
parenta3fd2bd87d1060d9f391969950c58cd56aad7847 (diff)
downloadffmpeg-streaming-636d6a4a472d756cfb0ee845249e1e4f303e2134.zip
ffmpeg-streaming-636d6a4a472d756cfb0ee845249e1e4f303e2134.tar.gz
Add the prefix "av_" to img_crop(), img_copy() and img_pad(), and rename "img"
to "picture" as suggested by Baptiste Coudurier. Originally committed as revision 8220 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h17
1 files changed, 14 insertions, 3 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 78897ce..a26534a 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3008,21 +3008,32 @@ void *av_mallocz_static(unsigned int size);
/**
* Copy image 'src' to 'dst'.
*/
-void img_copy(AVPicture *dst, const AVPicture *src,
+void av_picture_copy(AVPicture *dst, const AVPicture *src,
int pix_fmt, int width, int height);
/**
* Crop image top and left side
*/
-int img_crop(AVPicture *dst, const AVPicture *src,
+int av_picture_crop(AVPicture *dst, const AVPicture *src,
int pix_fmt, int top_band, int left_band);
/**
* Pad image
*/
-int img_pad(AVPicture *dst, const AVPicture *src, int height, int width, int pix_fmt,
+int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, int pix_fmt,
int padtop, int padbottom, int padleft, int padright, int *color);
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+attribute_deprecated void img_copy(AVPicture *dst, const AVPicture *src,
+ int pix_fmt, int width, int height);
+
+attribute_deprecated int img_crop(AVPicture *dst, const AVPicture *src,
+ int pix_fmt, int top_band, int left_band);
+
+attribute_deprecated int img_pad(AVPicture *dst, const AVPicture *src, int height, int width, int pix_fmt,
+ int padtop, int padbottom, int padleft, int padright, int *color);
+#endif
+
extern unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
/* error handling */
OpenPOWER on IntegriCloud