summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--libavcodec/avcodec.h4
-rw-r--r--libavcodec/h264.h1
-rw-r--r--libavcodec/h264_parser.c7
-rw-r--r--libavcodec/h264dec.h1
-rw-r--r--libavcodec/hevc.h1
-rw-r--r--libavcodec/hevc_parser.c8
-rw-r--r--libavformat/isom.c2
-rw-r--r--libavformat/mpegts.c2
8 files changed, 26 insertions, 0 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index bc35a61..aed0793 100644
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -324,6 +324,13 @@ 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:
+ /*00 00 00 01 7c 01 19 08
+ nal type = 0x7c & 0x1f;
+ any conflict?
+ */
+ avctx->has_dolby_vision_meta = 1;
+ break;
case H264_NAL_IDR_SLICE:
s->key_frame = 1;