diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 17:59:58 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 18:18:14 +0400 |
| commit | d168729004a949644f6268dbf5715ae92d43b0d2 (patch) | |
| tree | 4adbbb8899add9ca26603870ae98bbdb66ec9f1f /libavfilter/vf_shuffleplanes.c | |
| parent | 2d99de66b7f1f805ae75d7502508ede18b52e95a (diff) | |
| parent | 713d3f98c8b0ff6cc86985d9e4d85e3f5b3c7004 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_shuffleplanes: fix the type of the mapping indices
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_shuffleplanes.c')
| -rw-r--r-- | libavfilter/vf_shuffleplanes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vf_shuffleplanes.c b/libavfilter/vf_shuffleplanes.c index 8ca1b8bf00..7085b150ee 100644 --- a/libavfilter/vf_shuffleplanes.c +++ b/libavfilter/vf_shuffleplanes.c @@ -34,7 +34,7 @@ typedef struct ShufflePlanesContext { int planes; /* mapping indices */ - uint8_t map[4]; + int map[4]; /* set to 1 if some plane is used more than once, so we need to make a copy */ int copy; |