hevcdec: set the active SPS before calling get_format()
authorAnton Khirnov <anton@khirnov.net>
Mon, 24 Jul 2017 09:41:31 +0000 (11:41 +0200)
committerAnton Khirnov <anton@khirnov.net>
Fri, 28 Jul 2017 12:12:30 +0000 (14:12 +0200)
This way the SPS is available to the hwaccel init code.

libavcodec/hevcdec.c

index f6bbb70..664e4ac 100644 (file)
@@ -490,13 +490,14 @@ static int hls_slice_header(HEVCContext *s)
 
         ff_hevc_clear_refs(s);
 
+        ret = set_sps(s, sps, sps->pix_fmt);
+        if (ret < 0)
+            return ret;
+
         pix_fmt = get_format(s, sps);
         if (pix_fmt < 0)
             return pix_fmt;
-
-        ret = set_sps(s, sps, pix_fmt);
-        if (ret < 0)
-            return ret;
+        s->avctx->pix_fmt = pix_fmt;
 
         s->seq_decode = (s->seq_decode + 1) & 0xff;
         s->max_ra     = INT_MAX;