generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avfilter/vf_paletteuse: Use int where AVERROR can be returned

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-05 15:52:00 +01:00
parent 6d7e57e88b
commit 7ccc584824
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/vf_paletteuse.c
View File

@ -316,7 +316,7 @@ end:
* Note: r, g, and b are the component of c but are passed as well to avoid * Note: r, g, and b are the component of c but are passed as well to avoid
* recomputing them (they are generally computed by the caller for other uses). * recomputing them (they are generally computed by the caller for other uses).
*/ */
static av_always_inline uint8_t color_get(struct cache_node *cache, uint32_t color, static av_always_inline int color_get(struct cache_node *cache, uint32_t color,
uint8_t r, uint8_t g, uint8_t b, uint8_t r, uint8_t g, uint8_t b,
const struct color_node *map, const struct color_node *map,
const uint32_t *palette, const uint32_t *palette,
@ -346,7 +346,7 @@ static av_always_inline uint8_t color_get(struct cache_node *cache, uint32_t col
return e->pal_entry; return e->pal_entry;
} }
static av_always_inline uint8_t get_dst_color_err(struct cache_node *cache, static av_always_inline int get_dst_color_err(struct cache_node *cache,
uint32_t c, const struct color_node *map, uint32_t c, const struct color_node *map,
const uint32_t *palette, const uint32_t *palette,
int *er, int *eg, int *eb, int *er, int *eg, int *eb,
@ -355,7 +355,7 @@ static av_always_inline uint8_t get_dst_color_err(struct cache_node *cache,
const uint8_t r = c >> 16 & 0xff; const uint8_t r = c >> 16 & 0xff;
const uint8_t g = c >> 8 & 0xff; const uint8_t g = c >> 8 & 0xff;
const uint8_t b = c & 0xff; const uint8_t b = c & 0xff;
const uint8_t dstx = color_get(cache, c, r, g, b, map, palette, search_method); const int dstx = color_get(cache, c, r, g, b, map, palette, search_method);
const uint32_t dstc = palette[dstx]; const uint32_t dstc = palette[dstx];
*er = r - (dstc >> 16 & 0xff); *er = r - (dstc >> 16 & 0xff);
*eg = g - (dstc >> 8 & 0xff); *eg = g - (dstc >> 8 & 0xff);