[x264-devel] Eradicate all mention of Extended Profile

[Henrik Gramner]

x264 | branch: master | Henrik Gramner <hengar-6 at student.ltu.se> | Thu Apr 12 19:14:43 2012 +0200| [ee30c84e38b30896ffa6ddc417f3b4c281a86d1a] | committer: Jason Garrett-Glaser

Eradicate all mention of Extended Profile
x264 never supported it and never will because nobody uses it.

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=ee30c84e38b30896ffa6ddc417f3b4c281a86d1a
---

 common/set.h      |    1 -
 encoder/encoder.c |    2 +-
 encoder/set.c     |    4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/common/set.h b/common/set.h
index d68e8bf..62f0dc6 100644
--- a/common/set.h
+++ b/common/set.h
@@ -31,7 +31,6 @@ enum profile_e
 {
     PROFILE_BASELINE = 66,
     PROFILE_MAIN     = 77,
-    PROFILE_EXTENDED = 88,
     PROFILE_HIGH    = 100,
     PROFILE_HIGH10  = 110,
     PROFILE_HIGH422 = 122,
diff --git a/encoder/encoder.c b/encoder/encoder.c
index eff188d..7fb3972 100644
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -1346,7 +1346,7 @@ x264_t *x264_encoder_open( x264_param_t *param )
     char level[4];
     snprintf( level, sizeof(level), "%d.%d", h->sps->i_level_idc/10, h->sps->i_level_idc%10 );
     if( h->sps->i_level_idc == 9 || ( h->sps->i_level_idc == 11 && h->sps->b_constraint_set3 &&
-        (h->sps->i_profile_idc >= PROFILE_BASELINE && h->sps->i_profile_idc <= PROFILE_EXTENDED) ) )
+        (h->sps->i_profile_idc == PROFILE_BASELINE || h->sps->i_profile_idc == PROFILE_MAIN) ) )
         strcpy( level, "1b" );
 
     if( h->sps->i_profile_idc < PROFILE_HIGH10 )
diff --git a/encoder/set.c b/encoder/set.c
index e752a52..0612ba4 100644
--- a/encoder/set.c
+++ b/encoder/set.c
@@ -130,9 +130,9 @@ void x264_sps_init( x264_sps_t *sps, int i_id, x264_param_t *param )
     sps->b_constraint_set3  = 0;
 
     sps->i_level_idc = param->i_level_idc;
-    if( param->i_level_idc == 9 && ( sps->i_profile_idc >= PROFILE_BASELINE && sps->i_profile_idc <= PROFILE_EXTENDED ) )
+    if( param->i_level_idc == 9 && ( sps->i_profile_idc == PROFILE_BASELINE || sps->i_profile_idc == PROFILE_MAIN ) )
     {
-        sps->b_constraint_set3 = 1; /* level 1b with Baseline, Main or Extended profile is signalled via constraint_set3 */
+        sps->b_constraint_set3 = 1; /* level 1b with Baseline or Main profile is signalled via constraint_set3 */
         sps->i_level_idc      = 11;
     }
     /* Intra profiles */