1. ffmpeg
  2. Commit 35c8dda5c2dbeb37c659f964372edf6f2bde3b5f
Browse code

Merge commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1'

* commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1':
mov: Adjust variable types to fix format warnings

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2015/07/01 11:05:45
Showing 1 changed files
libavformat/mov.c
History View file @ 35c8dda
... ... 
@@ -1024,7 +1024,7 @@ static int mov_read_colr(MOVContext *c, AVIOContext *pb, MOVAtom atom)
1024 1024 
 {
1025 1025 
     AVStream *st;
1026 1026 
     char color_parameter_type[5] = { 0 };
1027 
-    int color_primaries, color_trc, color_matrix;
1027 
+    uint16_t color_primaries, color_trc, color_matrix;
1028 1028 
     int ret;
1029 1029
1030 1030 
     if (c->fc->nb_streams < 1)