[SCM] libav/experimental: remove gcc warnings about void * used in arithmetic

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 626a8fe724a7e68e140d4226d27fad1c2f62c60d
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Fri Sep 29 10:28:11 2006 +0000

    remove gcc warnings about void * used in arithmetic
    
    Originally committed as revision 6376 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 00ba5eb..158af6c 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -649,7 +649,7 @@ static int mov_read_smi(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 
     if (st->codec->extradata) {
         strcpy(st->codec->extradata, "SVQ3"); // fake
-        get_buffer(pb, st->codec->extradata + 0x5a, atom.size);
+        get_buffer(pb, (uint8_t *)st->codec->extradata + 0x5a, atom.size);
         dprintf("Reading SMI %"PRId64"  %s\n", atom.size, (char*)st->codec->extradata + 0x5a);
     } else
         url_fskip(pb, atom.size);
@@ -689,8 +689,8 @@ static int mov_read_alac(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     st->codec->extradata = (uint8_t*) av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
 
     if (st->codec->extradata) {
-        strcpy(st->codec->extradata + 4, "alac"); // fake
-        get_buffer(pb, st->codec->extradata + 8, 36 - 8);
+        strcpy((char *)st->codec->extradata + 4, "alac"); // fake
+        get_buffer(pb, (uint8_t *)st->codec->extradata + 8, 36 - 8);
         dprintf("Reading alac %d  %s\n", st->codec->extradata_size, (char*)st->codec->extradata);
     } else
         url_fskip(pb, atom.size);
@@ -735,8 +735,8 @@ static int mov_read_jp2h(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 
     /* pass all jp2h atom to codec */
     if (st->codec->extradata) {
-        strcpy(st->codec->extradata + 4, "jp2h");
-        get_buffer(pb, st->codec->extradata + 8, atom.size);
+        strcpy((char *)st->codec->extradata + 4, "jp2h");
+        get_buffer(pb, (uint8_t *)st->codec->extradata + 8, atom.size);
     } else
         url_fskip(pb, atom.size);
     return 0;

-- 
Libav/FFmpeg packaging