Merge commit 'e568db40258d549777ac1c16971678e18a18f5f5'

[ffmpeg] / libavcodec / imgconvert.c

diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 030810c916de593a7cf84053497ced3f2036b2d6..09d24899f13b8cc2623892c29d6fa6014b23fdef 100644 (file)
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -69,7 +69,7 @@ void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int
     *v_shift = desc->log2_chroma_h;
 }
 
-static get_color_type(AVPixFmtDescriptor *desc) {
+static int get_color_type(const AVPixFmtDescriptor *desc) {
     if(desc->nb_components == 1 || desc->nb_components == 2)
         return FF_COLOR_GRAY;