[FFmpeg-cvslog] ffv1: fix array data types

Michael Niedermayer git at videolan.org
Mon Dec 3 20:33:42 CET 2012


ffmpeg | branch: release/1.0 | Michael Niedermayer <michaelni at gmx.at> | Mon Oct  8 02:11:25 2012 +0200| [86c8ab1fd833cc17efade10f50d8800f038909cd] | committer: Michael Niedermayer

ffv1: fix array data types

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 106790a4e92f40fedbe20631c693c95c7c8f3039)

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

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

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

diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 572bcbb..c637b47 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -1242,7 +1242,7 @@ static int encode_slice(AVCodecContext *c, void *arg){
     }
     if(!fs->ac){
         if(f->version > 2)
-            put_rac(&fs->c, (int[]){129}, 0);
+            put_rac(&fs->c, (uint8_t[]){129}, 0);
         fs->ac_byte_count = f->version > 2 || (!x&&!y) ? ff_rac_terminate(&fs->c) : 0;
         init_put_bits(&fs->pb, fs->c.bytestream_start + fs->ac_byte_count, fs->c.bytestream_end - fs->c.bytestream_start - fs->ac_byte_count);
     }
@@ -1677,7 +1677,7 @@ static int decode_slice(AVCodecContext *c, void *arg){
 
     if(!fs->ac){
         if (f->version == 3 && f->minor_version > 1 || f->version > 3)
-            get_rac(&fs->c, (int[]){129});
+            get_rac(&fs->c, (uint8_t[]){129});
         fs->ac_byte_count = f->version > 2 || (!x&&!y) ? fs->c.bytestream - fs->c.bytestream_start - 1 : 0;
         init_get_bits(&fs->gb,
                       fs->c.bytestream_start + fs->ac_byte_count,
@@ -1706,7 +1706,7 @@ static int decode_slice(AVCodecContext *c, void *arg){
     }
     if(fs->ac && f->version > 2) {
         int v;
-        get_rac(&fs->c, (int[]){129});
+        get_rac(&fs->c, (uint8_t[]){129});
         v = fs->c.bytestream_end - fs->c.bytestream - 2 - 5*f->ec;
         if(v) {
             av_log(f->avctx, AV_LOG_ERROR, "bytestream end mismatching by %d\n", v);



More information about the ffmpeg-cvslog mailing list