aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/imgconvert.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-05 18:44:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-05 18:44:42 +0200
commit9afd55922a5d8dfac1d968656cb570ff36d894d3 (patch)
treeaec710bd03ffc13c28d278962e1e588ee3c42896 /libavcodec/imgconvert.c
parent7666828c44b5505a0988260965b1f44d9e253cb4 (diff)
downloadandroid_external_ffmpeg-9afd55922a5d8dfac1d968656cb570ff36d894d3.tar.gz
android_external_ffmpeg-9afd55922a5d8dfac1d968656cb570ff36d894d3.tar.bz2
android_external_ffmpeg-9afd55922a5d8dfac1d968656cb570ff36d894d3.zip
imgconvert: silence some const incompatible pointer warnings.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/imgconvert.c')
-rw-r--r--libavcodec/imgconvert.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 82da64b775..27f179a943 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -411,7 +411,7 @@ int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width,
unsigned char *dest, int dest_size)
{
return av_image_copy_to_buffer(dest, dest_size,
- src->data, src->linesize,
+ (const uint8_t * const*)src->data, src->linesize,
pix_fmt, width, height, 1);
}
@@ -607,7 +607,7 @@ enum PixelFormat avcodec_find_best_pix_fmt_of_list(enum PixelFormat *pix_fmt_lis
void av_picture_copy(AVPicture *dst, const AVPicture *src,
enum PixelFormat pix_fmt, int width, int height)
{
- av_image_copy(dst->data, dst->linesize, src->data,
+ av_image_copy(dst->data, dst->linesize, (const uint8_t **)src->data,
src->linesize, pix_fmt, width, height);
}