| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavcodec/h264.h | 3 | ||||
| -rw-r--r-- | libavcodec/h264_parser.c | 9 | ||||
| -rw-r--r-- | libavcodec/h264dec.c | 13 | ||||
| -rw-r--r-- | libavcodec/hevc.h | 1 | ||||
| -rw-r--r-- | libavcodec/hevcdec.c | 16 |
6 files changed, 41 insertions, 2 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index a96adb7..d22103c 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -324,13 +324,20 @@ static inline int parse_nal_units(AVCodecParserContext *s, case H264_NAL_SEI: ff_h264_sei_decode(&p->sei, &nal.gb, &p->ps, avctx); break; - case H264_NAL_264_DV: + case H264_NAL_264_DV_META: /*00 00 00 01 7c 01 19 08 nal type = 0x7c & 0x1f; any conflict? */ avctx->has_dolby_vision_meta = 1; break; + case H264_NAL_264_DV_EL: + /*00 00 00 01 7e + nal type = 0x7e & 0x1f; + any conflict? + */ + avctx->has_dolby_vision_el = 1; + break; case H264_NAL_IDR_SLICE: s->key_frame = 1; |