diff options
| author | 2010-11-09 15:48:11 -0800 | |
|---|---|---|
| committer | 2010-11-09 15:48:11 -0800 | |
| commit | c32474d90afa4396d202c2430710e0d6b694a878 (patch) | |
| tree | 47f11e89a1d4e5e9001f410fe4d090bada75e4e0 | |
| parent | 7b6d85013bb326527b151cd3785e22792e0d222d (diff) | |
| parent | 0244d94455236abd1c07e62f0e6cbbff37bf2c8c (diff) | |
Merge "Fix missing breaks in the profile/level conversion code in M4vH263 encoder"
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp b/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp index d5a5313926b0..72611cf34715 100644 --- a/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp +++ b/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp @@ -50,6 +50,7 @@ static status_t ConvertOmxProfileLevel( profileLevel = CORE_PROFILE_LEVEL2; break; } + break; default: LOGE("Unsupported profile (%d) for H263", omxProfile); return BAD_VALUE; @@ -74,7 +75,8 @@ static status_t ConvertOmxProfileLevel( LOGE("Unsupported level (%d) for MPEG4 simple profile", omxLevel); return BAD_VALUE; - } + } + break; case OMX_VIDEO_MPEG4ProfileSimpleScalable: switch (omxLevel) { case OMX_VIDEO_MPEG4Level0b: @@ -91,6 +93,7 @@ static status_t ConvertOmxProfileLevel( "scalable profile", omxLevel); return BAD_VALUE; } + break; case OMX_VIDEO_MPEG4ProfileCore: switch (omxLevel) { case OMX_VIDEO_MPEG4Level1: @@ -104,6 +107,7 @@ static status_t ConvertOmxProfileLevel( "profile", omxLevel); return BAD_VALUE; } + break; case OMX_VIDEO_MPEG4ProfileCoreScalable: switch (omxLevel) { case OMX_VIDEO_MPEG4Level1: @@ -120,6 +124,7 @@ static status_t ConvertOmxProfileLevel( "scalable profile", omxLevel); return BAD_VALUE; } + break; default: LOGE("Unsupported MPEG4 profile (%d)", omxProfile); return BAD_VALUE; |