Do not check rgb masks for YUV in GetFfmpegChroma.

e67115c0 · Laurent Aimar · 9230cef6 · e67115c0
Commit e67115c0 authored Sep 03, 2009 by Laurent Aimar
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

modules/codec/avcodec/chroma.c modules/codec/avcodec/chroma.c +6 -3

No files found.
--- a/modules/codec/avcodec/chroma.c
+++ b/modules/codec/avcodec/chroma.c
@@ -134,9 +134,12 @@ int GetFfmpegChroma( int *i_ffmpeg_chroma, const video_format_t fmt )
    {
        if( chroma_table[i].i_chroma == fmt.i_chroma )
        {
-            if( chroma_table[i].i_rmask == fmt.i_rmask &&
+            if( ( chroma_table[i].i_rmask == 0 &&
-                chroma_table[i].i_gmask == fmt.i_gmask &&
+                  chroma_table[i].i_gmask == 0 &&
-                chroma_table[i].i_bmask == fmt.i_bmask )
+                  chroma_table[i].i_bmask == 0 ) ||
+                ( chroma_table[i].i_rmask == fmt.i_rmask &&
+                  chroma_table[i].i_gmask == fmt.i_gmask &&
+                  chroma_table[i].i_bmask == fmt.i_bmask ) )
            {
                *i_ffmpeg_chroma = chroma_table[i].i_chroma_id;
                return VLC_SUCCESS;