[FFmpeg-cvslog] ffv1: Fix warnings about incompatible pointer type and discarded qualifiers

jamal git at videolan.org
Fri Jul 27 13:15:29 CEST 2012


ffmpeg | branch: master | jamal <jamrial at gmail.com> | Fri Jul 27 05:23:16 2012 -0300| [cb40d360749a5f991cc3e0fd24889e2eaf051905] | committer: Michael Niedermayer

ffv1: Fix warnings about incompatible pointer type and discarded qualifiers

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb40d360749a5f991cc3e0fd24889e2eaf051905
---

 libavcodec/ffv1.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 6d44df0..f00e247 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -2047,7 +2047,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
         if(i){
             ff_init_range_decoder(&fs->c, buf_p, v);
         }else
-            fs->c.bytestream_end = buf_p + v;
+            fs->c.bytestream_end = (uint8_t *)(buf_p + v);
     }
 
     avctx->execute(avctx, decode_slice, &f->slice_context[0], NULL, f->slice_count, sizeof(void*));
@@ -2065,7 +2065,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
                 src[j] = f->last_picture.data[j] + f->last_picture.linesize[j]*
                          (fs->slice_y>>sv) + (fs->slice_x>>sh);
             }
-            av_image_copy(dst, f->picture.linesize, src, f->last_picture.linesize,
+            av_image_copy(dst, f->picture.linesize, (const uint8_t **)src, f->last_picture.linesize,
                           avctx->pix_fmt, fs->slice_width, fs->slice_height);
         }
     }



More information about the ffmpeg-cvslog mailing list