Merge commit '61bd0ed781b56eea1e8e851aab34a2ee3b59fbac'

[ffmpeg] / libavcodec / hevc_parser.c

diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c
index d93586ba7dbd5a6e77ed75d2c2248de9352b3641..508f22f46d3afaa6b8fe2c88dbc7d811d5e7e77a 100644 (file)
--- a/libavcodec/hevc_parser.c
+++ b/libavcodec/hevc_parser.c
@@ -312,6 +312,14 @@ static inline int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf,
                 ps->vps = (HEVCVPS*)ps->vps_list[ps->sps->vps_id]->data;
             }
 
+            s->coded_width  = ps->sps->width;
+            s->coded_height = ps->sps->height;
+            s->width        = ps->sps->output_width;
+            s->height       = ps->sps->output_height;
+            s->format       = ps->sps->pix_fmt;
+            avctx->profile  = ps->sps->ptl.general_ptl.profile_idc;
+            avctx->level    = ps->sps->ptl.general_ptl.level_idc;
+
             if (!sh->first_slice_in_pic_flag) {
                 int slice_address_length;