Merge commit 'eccc03c8fbc603a0a3257df66f0705f74fe2581a'

* commit 'eccc03c8fbc603a0a3257df66f0705f74fe2581a':
  cbs_h264: Add support for filler NAL units

Some bitstream -> get_bits.

Merged-by: Mark Thompson <sw@jkqxz.net>

diff --cc libavcodec/cbs_h264.h
Simple merge

diff --cc libavcodec/cbs_h2645.c
index b717937e4a0a31f5b11b96469ab4d9933f8a485b,d6131a13e5ea87dca6dc36acb76c04aa3375e7e1..5ad0f2b500d05137abbcfe98488e2d1c68fbd01f
--- 1/libavcodec/cbs_h2645.c
--- 2/libavcodec/cbs_h2645.c
+++ b/libavcodec/cbs_h2645.c
@@@ -815,6 -815,19 +815,19 @@@ static int cbs_h264_read_nal_unit(Coded
          }
          break;
  
 -            err = cbs_h264_read_filler(ctx, &bc, unit->content);
+     case H264_NAL_FILLER_DATA:
+         {
+             err = ff_cbs_alloc_unit_content(ctx, unit,
+                                             sizeof(H264RawFiller), NULL);
+             if (err < 0)
+                 return err;
+ 
++            err = cbs_h264_read_filler(ctx, &gbc, unit->content);
+             if (err < 0)
+                 return err;
+         }
+         break;
+ 
      default:
          return AVERROR(ENOSYS);
      }

diff --cc libavcodec/cbs_h264_syntax_template.c
index 05370b81fa0687b1a77202e80035cfa506bcaa82,1aa7888584eb3807b70d5662ca432f2d3f397ce0..f58dee8a2587788e58d2d258564099d6458f4c52
--- 1/libavcodec/cbs_h264_syntax_template.c
--- 2/libavcodec/cbs_h264_syntax_template.c
+++ b/libavcodec/cbs_h264_syntax_template.c
@@@ -1247,3 -1247,32 +1247,32 @@@ static int FUNC(slice_header)(CodedBits
  
      return 0;
  }
 -    while (bitstream_peek(rw, 8) == 0xff) {
+ 
+ static int FUNC(filler)(CodedBitstreamContext *ctx, RWContext *rw,
+                         H264RawFiller *current)
+ {
+     av_unused int ff_byte = 0xff;
+     int err;
+ 
+     HEADER("Filler Data");
+ 
+     CHECK(FUNC(nal_unit_header)(ctx, rw, &current->nal_unit_header,
+                                 1 << H264_NAL_FILLER_DATA));
+ 
+ #ifdef READ
++    while (show_bits(rw, 8) == 0xff) {
+         xu(8, ff_byte, ff_byte, 0xff, 0xff);
+         ++current->filler_size;
+     }
+ #else
+     {
+         uint32_t i;
+         for (i = 0; i < current->filler_size; i++)
+             xu(8, ff_byte, ff_byte, 0xff, 0xff);
+     }
+ #endif
+ 
+     CHECK(FUNC(rbsp_trailing_bits)(ctx, rw));
+ 
+     return 0;
+ }