[FFmpeg-cvslog] avfilter/vf_paletteuse: Use int where AVERROR can be returned

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar  5 15:52:00 2015 +0100| [7ccc5848248ba0d4adfa381cf93b0d7b752d9d32] | committer: Michael Niedermayer

avfilter/vf_paletteuse: Use int where AVERROR can be returned

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ccc5848248ba0d4adfa381cf93b0d7b752d9d32
---

 libavfilter/vf_paletteuse.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c
index cba0eb3..75e3118 100644
--- a/libavfilter/vf_paletteuse.c
+++ b/libavfilter/vf_paletteuse.c
@@ -316,7 +316,7 @@ end:
  * 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).
  */
-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,
                                           const struct color_node *map,
                                           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;
 }
 
-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,
                                                   const uint32_t *palette,
                                                   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 g = c >>  8 & 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];
     *er = r - (dstc >> 16 & 0xff);
     *eg = g - (dstc >>  8 & 0xff);