--- This profile got dropped in 2005, I think it should be not listed as supported profile. Vittorio
libavcodec/avcodec.h | 2 ++ libavcodec/h264.c | 2 ++ libavcodec/h264_ps.c | 5 ++++- libavcodec/version.h | 5 ++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 54c60a9..3e256f5 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2633,7 +2633,9 @@ typedef struct AVCodecContext { #define FF_PROFILE_H264_HIGH_10_INTRA (110|FF_PROFILE_H264_INTRA) #define FF_PROFILE_H264_HIGH_422 122 #define FF_PROFILE_H264_HIGH_422_INTRA (122|FF_PROFILE_H264_INTRA) +#if FF_API_OLDH264_HIGH444 #define FF_PROFILE_H264_HIGH_444 144 +#endif #define FF_PROFILE_H264_HIGH_444_PREDICTIVE 244 #define FF_PROFILE_H264_HIGH_444_INTRA (244|FF_PROFILE_H264_INTRA) #define FF_PROFILE_H264_CAVLC_444 44 diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 1c27f05..03a44a9 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -5016,7 +5016,9 @@ static const AVProfile profiles[] = { { FF_PROFILE_H264_HIGH_10_INTRA, "High 10 Intra" }, { FF_PROFILE_H264_HIGH_422, "High 4:2:2" }, { FF_PROFILE_H264_HIGH_422_INTRA, "High 4:2:2 Intra" }, +#if FF_API_OLDH264_HIGH444 { FF_PROFILE_H264_HIGH_444, "High 4:4:4" }, +#endif { FF_PROFILE_H264_HIGH_444_PREDICTIVE, "High 4:4:4 Predictive" }, { FF_PROFILE_H264_HIGH_444_INTRA, "High 4:4:4 Intra" }, { FF_PROFILE_H264_CAVLC_444, "CAVLC 4:4:4" }, diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index e4ce177..562e0a0 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -333,7 +333,10 @@ int ff_h264_decode_seq_parameter_set(H264Context *h) sps->profile_idc == FF_PROFILE_H264_HIGH_422 || sps->profile_idc == FF_PROFILE_H264_HIGH_444_PREDICTIVE || sps->profile_idc == FF_PROFILE_H264_CAVLC_444 || - sps->profile_idc == FF_PROFILE_H264_HIGH_444) { +#if FF_API_OLDH264_HIGH444 + sps->profile_idc == FF_PROFILE_H264_HIGH_444 +#endif + ) { sps->chroma_format_idc = get_ue_golomb_31(&h->gb); if (sps->chroma_format_idc > 3) { av_log(h->avctx, AV_LOG_ERROR, diff --git a/libavcodec/version.h b/libavcodec/version.h index cdd5a61..09d782c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 34 -#define LIBAVCODEC_VERSION_MICRO 1 +#define LIBAVCODEC_VERSION_MICRO 2 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -123,5 +123,8 @@ #ifndef FF_API_EMU_EDGE #define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_OLDH264_HIGH444 +#define FF_API_OLDH264_HIGH444 (LIBAVCODEC_VERSION_MAJOR < 56) +#endif #endif /* AVCODEC_VERSION_H */ -- 1.8.4 _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel