diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 04:05:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 04:06:42 +0200 |
| commit | 35c8dda5c2dbeb37c659f964372edf6f2bde3b5f (patch) | |
| tree | 527c264b1199c541bd0286638f74e63e9270647f | |
| parent | a8e137a32286adddeb08f4f156c16cfe8bbf612e (diff) | |
| parent | 2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1 (diff) | |
| download | ffmpeg-streaming-35c8dda5c2dbeb37c659f964372edf6f2bde3b5f.zip ffmpeg-streaming-35c8dda5c2dbeb37c659f964372edf6f2bde3b5f.tar.gz | |
Merge commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1'
* commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1':
mov: Adjust variable types to fix format warnings
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 4762816..323dfe1 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1024,7 +1024,7 @@ static int mov_read_colr(MOVContext *c, AVIOContext *pb, MOVAtom atom) { AVStream *st; char color_parameter_type[5] = { 0 }; - int color_primaries, color_trc, color_matrix; + uint16_t color_primaries, color_trc, color_matrix; int ret; if (c->fc->nb_streams < 1) |
