From 9ed18f302b09e444f5b1be01979cce62c4b2c04a Mon Sep 17 00:00:00 2001
From: Mark Thompson <sw@jkqxz.net>
Date: Sat, 23 Sep 2017 16:46:11 +0100
Subject: [PATCH] cbs_h264: Fix writing streams with auxiliary pictures

Tested with the alphaconformanceG sample.
---
 libavcodec/cbs_h2645.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c
index 50a227da78..a1b887fd4c 100644
--- a/libavcodec/cbs_h2645.c
+++ b/libavcodec/cbs_h2645.c
@@ -1002,7 +1002,7 @@ static int cbs_h264_write_nal_unit(CodedBitstreamContext *ctx,
 
     case H264_NAL_SPS_EXT:
         {
-            H264RawSPSExtension *sps_ext;
+            H264RawSPSExtension *sps_ext = unit->content;
 
             err = cbs_h264_write_sps_extension(ctx, pbc, sps_ext);
             if (err < 0)
@@ -1026,6 +1026,7 @@ static int cbs_h264_write_nal_unit(CodedBitstreamContext *ctx,
 
     case H264_NAL_SLICE:
     case H264_NAL_IDR_SLICE:
+    case H264_NAL_AUXILIARY_SLICE:
         {
             H264RawSlice *slice = unit->content;
             BitstreamContext bc;