Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

h264_levels, h264_metadata_bsf: Fix levels typo

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

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@googlemail.com>
Signed-off-by: Mark Thompson <sw@jkqxz.net>
pull/300/head
Andreas Rheinhardt 6 years ago committed by Mark Thompson
parent 13ee107afd
commit 959521b58d
3 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavcodec/h264_levels.c
  2. 2
      libavcodec/h264_metadata_bsf.c
  3. 2
      libavcodec/tests/h264_levels.c

2
libavcodec/h264_levels.c
Unescape View File

@ -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 },

2
libavcodec/h264_metadata_bsf.c
Unescape View File

@ -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;

2
libavcodec/tests/h264_levels.c
Unescape View File

@ -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 },

Write Preview
Loading…
Cancel
Save