Commit 35c8dda5 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '2eef75fd'

* commit '2eef75fd':
  mov: Adjust variable types to fix format warnings
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents a8e137a3 2eef75fd
...@@ -1024,7 +1024,7 @@ static int mov_read_colr(MOVContext *c, AVIOContext *pb, MOVAtom atom) ...@@ -1024,7 +1024,7 @@ static int mov_read_colr(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{ {
AVStream *st; AVStream *st;
char color_parameter_type[5] = { 0 }; char color_parameter_type[5] = { 0 };
int color_primaries, color_trc, color_matrix; uint16_t color_primaries, color_trc, color_matrix;
int ret; int ret;
if (c->fc->nb_streams < 1) if (c->fc->nb_streams < 1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment