[FFmpeg-cvslog] h264_levels, h264_metadata_bsf: Fix levels typo

Andreas Rheinhardt git at videolan.org
Tue Nov 13 23:15:20 EET 2018


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at googlemail.com> | Mon Nov 12 15:18:12 2018 +0100| [959521b58de945ce8aacd4b0ba84958fc192a2c9] | committer: Mark Thompson

h264_levels, h264_metadata_bsf: Fix levels typo

profile_idc for level 1b should be 11, not 10.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at googlemail.com>
Signed-off-by: Mark Thompson <sw at jkqxz.net>

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

 libavcodec/h264_levels.c       | 2 +-
 libavcodec/h264_metadata_bsf.c | 2 +-
 libavcodec/tests/h264_levels.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/h264_levels.c b/libavcodec/h264_levels.c
index 737b7dcf06..7a55116773 100644
--- a/libavcodec/h264_levels.c
+++ b/libavcodec/h264_levels.c
@@ -25,7 +25,7 @@ static const H264LevelDescriptor h264_levels[] = {
     //  | level_idc     |       MaxFS            |    MaxCPB        | MaxMvsPer2Mb
     //  |     | cs3f    |         |  MaxDpbMbs   |       |  MaxVmvR |   |
     { "1",   10, 0,     1485,     99,    396,     64,    175,   64, 2,  0 },
-    { "1b",  10, 1,     1485,     99,    396,    128,    350,   64, 2,  0 },
+    { "1b",  11, 1,     1485,     99,    396,    128,    350,   64, 2,  0 },
     { "1b",   9, 0,     1485,     99,    396,    128,    350,   64, 2,  0 },
     { "1.1", 11, 0,     3000,    396,    900,    192,    500,  128, 2,  0 },
     { "1.2", 12, 0,     6000,    396,   2376,    384,   1000,  128, 2,  0 },
diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c
index bf37528234..521bc36b7e 100644
--- a/libavcodec/h264_metadata_bsf.c
+++ b/libavcodec/h264_metadata_bsf.c
@@ -258,7 +258,7 @@ static int h264_metadata_update_sps(AVBSFContext *bsf,
             if (sps->profile_idc == 66 ||
                 sps->profile_idc == 77 ||
                 sps->profile_idc == 88) {
-                sps->level_idc = 10;
+                sps->level_idc = 11;
                 sps->constraint_set3_flag = 1;
             } else {
                 sps->level_idc = 9;
diff --git a/libavcodec/tests/h264_levels.c b/libavcodec/tests/h264_levels.c
index 794517eb6c..0e00f05af6 100644
--- a/libavcodec/tests/h264_levels.c
+++ b/libavcodec/tests/h264_levels.c
@@ -102,7 +102,7 @@ static const struct {
     // Check level 1b.
     {  32 * 1200,  66, 10 },
     {  32 * 1500, 100, 10 },
-    {  96 * 1200,  66, 10 },
+    {  96 * 1200,  66, 11 },
     {  96 * 1500, 100,  9 },
     { 144 * 1200,  66, 11 },
     { 144 * 1500, 100, 11 },



More information about the ffmpeg-cvslog mailing list