Skip to content

[pull] master from FFmpeg:master#780

Merged
pull[bot] merged 8 commits intoMu-L:masterfrom
FFmpeg:master
Mar 24, 2021
Merged

[pull] master from FFmpeg:master#780
pull[bot] merged 8 commits intoMu-L:masterfrom
FFmpeg:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Mar 24, 2021

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

dingintel2021 and others added 7 commits March 24, 2021 13:53
Signed-off-by: Wenlong Ding <wenlong.ding@intel.com>
Signed-off-by: Wenlong Ding <wenlong.ding@intel.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Our "get name" functions can return NULL for invalid/unknown
arguments. So check for this.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
…names

If the numerical constants for colorspace, transfer characteristics
and color primaries coincide, the current code presumes the
corresponding names to be identical and prints only one of them obtained
via av_get_colorspace_name(). There are two issues with this: The first
is that the underlying assumption is wrong: The names only coincide in
the 0-7 range, they differ for more recent additions. The second is that
av_get_colorspace_name() is outdated itself; it has not been updated
with the names of the newly defined colorspaces.

Fix both of this by using the names from
av_color_(space|primaries|transfer)_name() and comparing them via
strcmp; don't use av_get_colorspace_name() at all.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
It automatically records the current length of the string,
whereas the current code contains lots of instances of
snprintf(buf + strlen(buf), buf_size - strlen(buf), ...).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Contrary to av_color_space_name() it doesn't even support newer
colorspaces.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
@pull pull bot added the ⤵️ pull label Mar 24, 2021
Corrected from nb_inputs to inputs
@pull pull bot merged commit 322be61 into Mu-L:master Mar 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants