summaryrefslogtreecommitdiff
path: root/libavcodec/imgconvert.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-26 01:34:26 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-26 01:34:26 +0100
commit2eab1a178ca4dad167b74e75c51adfbdeac358ca (patch)
tree06859758abb5aff67b189de1540cd7df54b7617c /libavcodec/imgconvert.c
parent4f927542fbf6ae98301a7a97e0ca41fa1ba3b04b (diff)
downloadffmpeg-2eab1a178ca4dad167b74e75c51adfbdeac358ca.tar.gz
imgconvert: dont depend on default return type for get_color_type()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/imgconvert.c')
-rw-r--r--libavcodec/imgconvert.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 030810c916..66ce9cd0d9 100644
--- 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(AVPixFmtDescriptor *desc) {
if(desc->nb_components == 1 || desc->nb_components == 2)
return FF_COLOR_GRAY;