[FFmpeg-cvslog] imgconvert: dont depend on default return type for get_color_type()

Michael Niedermayer git at videolan.org
Wed Dec 26 01:48:11 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 26 01:34:26 2012 +0100| [2eab1a178ca4dad167b74e75c51adfbdeac358ca] | committer: Michael Niedermayer

imgconvert: dont depend on default return type for get_color_type()

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

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

 libavcodec/imgconvert.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 030810c..66ce9cd 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;
 



More information about the ffmpeg-cvslog mailing list