mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-03 05:10:03 +02:00
Merge commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1'
* commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1': mov: Adjust variable types to fix format warnings Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
35c8dda5c2
@ -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)
|
||||||
|
Loading…
Reference in New Issue
Block a user