[FFmpeg-cvslog] cbs_h264: Fix writing streams with auxiliary pictures

[Mark Thompson]

ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Sat Sep 23 16:46:11 2017 +0100| [624d4739dbfc950ee756e83ae187f97dc82d10c9] | committer: Mark Thompson

cbs_h264: Fix writing streams with auxiliary pictures

Tested with the alphaconformanceG sample.

Fixes CID 1419836.

(cherry picked from commit 9ed18f302b09e444f5b1be01979cce62c4b2c04a)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=624d4739dbfc950ee756e83ae187f97dc82d10c9
---

 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 bd2b5cbbf2..9039e0f6f4 100644
--- a/libavcodec/cbs_h2645.c
+++ b/libavcodec/cbs_h2645.c
@@ -1008,7 +1008,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)
@@ -1032,6 +1032,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;
             GetBitContext gbc;