| Message ID | AM7PR03MB6660255F0FA2435A375C6BC58F5E9@AM7PR03MB6660.eurprd03.prod.outlook.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [FFmpeg-devel,01/13] lavc/h264: replace MAX_MMCO_COUNT with H264_MAX_MMCO_COUNT | expand |
| Context | Check | Description |
|---|---|---|
| andriy/configure_armv7_RPi4 | warning | Failed to apply patch |
| andriy/configurex86 | warning | Failed to apply patch |
| andriy/configure_aarch64_jetson | warning | Failed to apply patch |
diff --git a/libavcodec/h264_parse.h b/libavcodec/h264_parse.h index 3901b46ac2..4b79bd63eb 100644 --- a/libavcodec/h264_parse.h +++ b/libavcodec/h264_parse.h @@ -124,11 +124,6 @@ int ff_h264_decode_extradata(const uint8_t *data, int size, H264ParamSets *ps, int *is_avc, int *nal_length_size, int err_recognition, void *logctx); -/** - * compute profile from sps - */ -int ff_h264_get_profile(const SPS *sps); - static av_always_inline uint32_t pack16to32(unsigned a, unsigned b) { #if HAVE_BIGENDIAN diff --git a/libavcodec/h264_ps.h b/libavcodec/h264_ps.h index 3f1ab72e38..dc52835ed4 100644 --- a/libavcodec/h264_ps.h +++ b/libavcodec/h264_ps.h @@ -152,6 +152,11 @@ typedef struct H264ParamSets { int overread_warning_printed[2]; } H264ParamSets; +/** + * compute profile from sps + */ +int ff_h264_get_profile(const SPS *sps); + /** * Decode SPS */ diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c index 04d5026e68..e8af00ec00 100644 --- a/libavcodec/mediacodecdec.c +++ b/libavcodec/mediacodecdec.c @@ -33,6 +33,7 @@ #include "avcodec.h" #include "decode.h" #include "h264_parse.h" +#include "h264_ps.h" #include "hevc_parse.h" #include "hwconfig.h" #include "internal.h"
It is a more fitting place for it. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/h264_parse.h | 5 ----- libavcodec/h264_ps.h | 5 +++++ libavcodec/mediacodecdec.c | 1 + 3 files changed, 6 insertions(+), 5 deletions(-)