diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3a1936e538..60542439260 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,9 +50,9 @@ if(WIN32)
 	enable_language(RC)
 	set(CMAKE_RC_COMPILER windres)
 	file(
-		DOWNLOAD "https://github.com/TheElixZammuto/sunshine-prebuilt/releases/download/1.0.0/pre-compiled.zip" "${CMAKE_CURRENT_BINARY_DIR}/pre-compiled.zip"
+		DOWNLOAD "https://github.com/caioavidal/sunshine-prebuilt/releases/download/1.0.0/pre-compiled.zip" "${CMAKE_CURRENT_BINARY_DIR}/pre-compiled.zip"
 		TIMEOUT 60
-		EXPECTED_HASH SHA256=5d59986bd7f619eaaf82b2dd56b5127b747c9cbe8db61e3b898ff6b485298ed6)
+		EXPECTED_HASH SHA256=bf0cab8832272f7e077ee87a678bfd9edfeddb6cd613c0aab25a0d893ff08eda)
 
 	file(ARCHIVE_EXTRACT
 		INPUT "${CMAKE_CURRENT_BINARY_DIR}/pre-compiled.zip"
@@ -109,6 +109,7 @@ if(WIN32)
 		${SUNSHINE_PREPARED_BINARIES}/lib/libx264.a
 		${SUNSHINE_PREPARED_BINARIES}/lib/libx265.a
 		${SUNSHINE_PREPARED_BINARIES}/lib/libhdr10plus.a
+		${SUNSHINE_PREPARED_BINARIES}/lib/libmfx.a
 		z lzma bcrypt libiconv.a)
 
 	list(PREPEND PLATFORM_LIBRARIES
@@ -379,8 +380,6 @@ include_directories(
   ${PLATFORM_INCLUDE_DIRS}
 )
 
-add_subdirectory(third-party/cbs)
-
 string(TOUPPER "x${CMAKE_BUILD_TYPE}" BUILD_TYPE)
 if("${BUILD_TYPE}" STREQUAL "XDEBUG")
 	list(APPEND SUNSHINE_COMPILE_OPTIONS -O0 -ggdb3)
@@ -404,12 +403,8 @@ if(NOT SUNSHINE_DEFAULT_DIR)
 	set(SUNSHINE_DEFAULT_DIR "${SUNSHINE_ASSETS_DIR}")
 endif()
 
-list(APPEND CBS_EXTERNAL_LIBRARIES
-	cbs)
-
 list(APPEND SUNSHINE_EXTERNAL_LIBRARIES
 		libminiupnpc-static
-		${CBS_EXTERNAL_LIBRARIES}
 		${CMAKE_THREAD_LIBS_INIT}
 		enet
 		opus
diff --git a/assets/sunshine.conf b/assets/sunshine.conf
index a1e020f03c9..7987fac987f 100644
--- a/assets/sunshine.conf
+++ b/assets/sunshine.conf
@@ -315,4 +315,4 @@
 # To set the initial state of flags -0 and -1 to on, set the following flags:
 # flags = 012
 #
-# See: sunshine --help for all options under the header: flags
+# See: sunshine --help for all options under the header: flags
\ No newline at end of file
diff --git a/assets/web/config.html b/assets/web/config.html
index 203e807fea5..737f60a71f3 100644
--- a/assets/web/config.html
+++ b/assets/web/config.html
@@ -1,15 +1,10 @@
 <div id="app" class="container">
-  <h1 class="my-4">Configuration</h1>
-  <div class="form" v-if="config">
-    <!--Header-->
-    <ul class="nav nav-tabs">
-      <li class="nav-item" v-for="tab in tabs" :key="tab.id">
-        <a
-          class="nav-link"
-          :class="{'active': tab.id === currentTab}"
-          href="#"
-          @click="currentTab = tab.id"
-          >{{tab.name}}</a
+    <h1 class="my-4">Configuration</h1>
+    <div class="form" v-if="config">
+        <!--Header-->
+        <ul class="nav nav-tabs">
+            <li class="nav-item" v-for="tab in tabs" :key="tab.id">
+                <a class="nav-link" :class="{'active': tab.id === currentTab}" href="#" @click="currentTab = tab.id">{{tab.name}}</a
         >
       </li>
     </ul>
@@ -397,7 +392,7 @@ <h1 class="my-4">Configuration</h1>
           v-model="config.output_name"
         />
         <div class="form-text">
-          You can select the video card you want to stream:<br />
+          You can select the display you want to stream:<br />
           The appropriate values can be found using the following command:<br />
           tools\dxgi-info.exe<br />
           <br />
@@ -501,6 +496,7 @@ <h1 class="my-4">Configuration</h1>
           <option value="nvenc">nVidia NVENC</option>
           <option value="amdvce">AMD AMF/VCE</option>
           <option value="vaapi">VA-API</option>
+          <option value="quicksync">Intel QuickSync</option>
           <option value="software">Software</option>
         </select>
         <div class="form-text">
@@ -629,6 +625,50 @@ <h1 class="my-4">Configuration</h1>
         </div>
       </div>
     </div>
+    <!-- Intel QuickSync Settings-->
+    <div v-if="currentTab === 'qsv'" class="config-page">
+      <div class="mb-3">
+        <label for="qsv_preset" class="form-label">QuickSync Presets</label>
+        <div class="form-text">
+          <label for="qsv_preset" class="form-label">QuickSync Preset</label>
+          <select id="qsv_preset" class="form-select" v-model="config.qsv_preset">
+            <option value="7">Very Fast</option>
+            <option value="6">Faster</option>
+            <option value="5">Fast</option>
+            <option value="4">Medium</option>
+            <option value="3">Slow</option>
+            <option value="2">Slower</option>
+            <option value="1">Very Slow</option>
+          </select>
+        </div>
+      </div>
+      <div class="mb-3">
+          <label for="qsv_cavlc" class="form-label">CAVLC</label>
+          <div class="form-text">
+            <label for="qsv_cavlc" class="form-label">Enable CAVLC</label>
+            <select id="qsv_cavlc" class="form-select" v-model="config.qsv_cavlc">
+              <option value="1">Enabled</option>
+              <option value="0">Disabled</option>
+          
+            </select>
+          </div>
+      </div>
+      <div class="mb-3" class="config-page">
+        <label for="qsv_child_device" class="form-label">Child Device</label>
+        <input
+          type="text"
+          class="form-control"
+          id="qsv_child_device"
+          placeholder="0"
+          v-model="config.qsv_child_device"
+        />
+        <div class="form-text">
+          You can select your intel device index:<br />
+          Usually 0 or 1<br />
+          <br />
+        </div>
+      </div>
+    </div>
     <!--Nvidia Encoder Settings-->
     <div v-if="currentTab === 'nv'" class="config-page">
       <!--NVENC SETTINGS-->
@@ -787,6 +827,10 @@ <h1 class="my-4">Configuration</h1>
             id: "sw",
             name: "Software Encoder",
           },
+          {
+            id: "qsv",
+            name: "QuickSync Encoder",
+          },
           {
             id: "nv",
             name: "NVENC Encoder",
@@ -839,6 +883,8 @@ <h1 class="my-4">Configuration</h1>
             this.config.origin_web_manager_allowed || "lan";
           this.config.hevc_mode = this.config.hevc_mode || 0;
           this.config.encoder = this.config.encoder || "";
+          this.config.qsv_preset = this.config.qsv_preset || "4";
+          this.config.qsv_cavlc = this.config.qsv_cavlc || "0";
           this.config.nv_preset = this.config.nv_preset || "default";
           this.config.nv_rc = this.config.nv_rc || "auto";
           this.config.nv_coder = this.config.nv_coder || "auto";
@@ -902,4 +948,4 @@ <h1 class="my-4">Configuration</h1>
     font-size: 12px;
     font-weight: bold;
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/sunshine/config.cpp b/sunshine/config.cpp
index 6aaeb3058e2..876f3cd5f01 100644
--- a/sunshine/config.cpp
+++ b/sunshine/config.cpp
@@ -1,8 +1,10 @@
 #include <algorithm>
+#include <charconv>
 #include <filesystem>
 #include <fstream>
 #include <functional>
 #include <iostream>
+#include <string>
 #include <unordered_map>
 
 #include <boost/asio.hpp>
@@ -162,6 +164,26 @@ int coder_from_view(const std::string_view &coder) {
 }
 } // namespace amd
 
+namespace qsv {
+enum preset_e : int {
+  _default = 4,
+  veryslow = 1,
+  slower   = 2,
+  slow     = 3,
+  medium   = 4,
+  fast     = 5,
+  faster   = 6,
+  veryfast = 7
+};
+
+enum cavlc_e : int {
+  _auto    = false,
+  enabled  = true,
+  disabled = false
+};
+
+} // namespace qsv
+
 namespace vt {
 
 enum coder_e : int {
@@ -208,14 +230,15 @@ video_t video {
     "superfast"s,   // preset
     "zerolatency"s, // tune
   },                // software
-
   {
     nv::llhq,
     std::nullopt,
     -1 }, // nv
-
   {
-    amd::balanced,
+    qsv::medium,
+    qsv::disabled,
+    "" }, //qsv
+  { amd::balanced,
     std::nullopt,
     std::nullopt,
     -1 }, // amd
@@ -711,6 +734,10 @@ void apply_config(std::unordered_map<std::string, std::string> &&vars) {
   int_f(vars, "nv_rc", video.nv.rc, nv::rc_from_view);
   int_f(vars, "nv_coder", video.nv.coder, nv::coder_from_view);
 
+  int_f(vars, "qsv_preset", video.qsv.preset);
+  int_f(vars, "qsv_cavlc", video.qsv.cavlc);
+  string_f(vars, "qsv_child_device", video.qsv.child_device);
+
   int_f(vars, "amd_quality", video.amd.quality, amd::quality_from_view);
 
   std::string rc;
diff --git a/sunshine/config.h b/sunshine/config.h
index 183139612dc..c416d2db8b5 100644
--- a/sunshine/config.h
+++ b/sunshine/config.h
@@ -26,6 +26,12 @@ struct video_t {
     std::optional<int> rc;
     int coder;
   } nv;
+  
+  struct {
+    std::optional<int> preset;
+    std::optional<int> cavlc;
+    std::string child_device;
+  } qsv;
 
   struct {
     std::optional<int> quality;
diff --git a/sunshine/video.cpp b/sunshine/video.cpp
index b2a8858b2be..ae599dfd3ad 100644
--- a/sunshine/video.cpp
+++ b/sunshine/video.cpp
@@ -22,6 +22,7 @@ extern "C" {
 #ifdef _WIN32
 extern "C" {
 #include <libavutil/hwcontext_d3d11va.h>
+#include <libavutil/hwcontext_qsv.h>
 }
 #endif
 
@@ -72,8 +73,8 @@ platf::pix_fmt_e map_pix_fmt(AVPixelFormat fmt);
 util::Either<buffer_t, int> dxgi_make_hwdevice_ctx(platf::hwdevice_t *hwdevice_ctx);
 util::Either<buffer_t, int> vaapi_make_hwdevice_ctx(platf::hwdevice_t *hwdevice_ctx);
 util::Either<buffer_t, int> cuda_make_hwdevice_ctx(platf::hwdevice_t *hwdevice_ctx);
+util::Either<buffer_t, int> qsv_make_hwdevice_ctx(platf::hwdevice_t *hwdevice_ctx);
 
-int hwframe_ctx(ctx_t &ctx, buffer_t &hwdevice, AVPixelFormat format);
 
 class swdevice_t : public platf::hwdevice_t {
 public:
@@ -319,8 +320,12 @@ struct encoder_t {
   int flags;
 
   std::function<util::Either<buffer_t, int>(platf::hwdevice_t *hwdevice)> make_hwdevice_ctx;
+  int hwframe_initial_pool_size;
 };
 
+int hwframe_ctx(ctx_t &ctx, buffer_t &hwdevice, AVPixelFormat format, const encoder_t &encoder);
+
+
 class session_t {
 public:
   session_t() = default;
@@ -441,6 +446,8 @@ static encoder_t nvenc {
   PARALLEL_ENCODING,
   cuda_make_hwdevice_ctx
 #endif
+  ,
+  -1
 };
 
 #ifdef _WIN32
@@ -472,7 +479,38 @@ static encoder_t amdvce {
     "h264_amf"s,
   },
   DEFAULT,
-  dxgi_make_hwdevice_ctx
+  dxgi_make_hwdevice_ctx,
+  -1
+};
+
+
+static encoder_t quicksync {
+  "quicksync"sv,
+  { FF_PROFILE_H264_HIGH, FF_PROFILE_HEVC_MAIN },
+  AV_HWDEVICE_TYPE_QSV,
+  AV_PIX_FMT_QSV,
+  AV_PIX_FMT_NV12, AV_PIX_FMT_P010,
+  {
+    {
+      { "forced_idr"s, "1" },
+      { "preset"s, &config::video.qsv.preset },
+    },
+    std::make_optional<encoder_t::option_t>({ "qp"s, &config::video.qp }),
+    "hevc_qsv"s,
+  },
+  {
+    {
+      { "preset"s, &config::video.qsv.preset },
+      { "cavlc"s, &config::video.qsv.cavlc },
+      { "forced_idr"s, "1" },
+      //{ "async_depth"s, "1" }
+    },
+    std::make_optional<encoder_t::option_t>({ "qp"s, &config::video.qp }),
+    "h264_qsv"s,
+  },
+  PARALLEL_ENCODING,
+  qsv_make_hwdevice_ctx,
+  20
 };
 #endif
 
@@ -497,16 +535,16 @@ static encoder_t software {
     "libx265"s,
   },
   {
-    {
-      { "preset"s, &config::video.sw.preset },
-      { "tune"s, &config::video.sw.tune },
-    },
+    { { "preset"s, &config::video.sw.preset },
+      { "tune"s, &config::video.sw.tune } },
     std::make_optional<encoder_t::option_t>("qp"s, &config::video.qp),
     "libx264"s,
   },
   H264_ONLY | PARALLEL_ENCODING,
 
-  nullptr
+  nullptr,
+  -1
+
 };
 
 #ifdef __linux__
@@ -534,7 +572,8 @@ static encoder_t vaapi {
   },
   LIMITED_GOP_SIZE | PARALLEL_ENCODING | SINGLE_SLICE_ONLY,
 
-  vaapi_make_hwdevice_ctx
+  vaapi_make_hwdevice_ctx,
+  nullptr
 };
 #endif
 
@@ -565,6 +604,7 @@ static encoder_t videotoolbox {
   },
   DEFAULT,
 
+  nullptr,
   nullptr
 };
 #endif
@@ -575,6 +615,7 @@ static std::vector<encoder_t> encoders {
 #endif
 #ifdef _WIN32
   amdvce,
+  quicksync,
 #endif
 #ifdef __linux__
   vaapi,
@@ -927,7 +968,7 @@ std::optional<session_t> make_session(const encoder_t &encoder, const config_t &
     }
 
     hwdevice_ctx = std::move(buf_or_error.left());
-    if(hwframe_ctx(ctx, hwdevice_ctx, sw_fmt)) {
+    if(hwframe_ctx(ctx, hwdevice_ctx, sw_fmt, encoder)) {
       return std::nullopt;
     }
 
@@ -1032,6 +1073,9 @@ std::optional<session_t> make_session(const encoder_t &encoder, const config_t &
   if(!video_format[encoder_t::NALU_PREFIX_5b]) {
     auto nalu_prefix = config.videoFormat ? hevc_nalu : h264_nalu;
 
+    session.replacements.emplace_back("\000\000\000\001\'"sv, "\000\000\000\001g"sv); //sps
+    session.replacements.emplace_back("\000\000\000\001("sv, "\000\000\000\001h"sv);  //pps
+    session.replacements.emplace_back("\000\000\001%"sv, "\000\000\001e"sv);          //idr
     session.replacements.emplace_back(nalu_prefix.substr(1), nalu_prefix);
   }
 
@@ -1684,15 +1728,18 @@ int init() {
   return 0;
 }
 
-int hwframe_ctx(ctx_t &ctx, buffer_t &hwdevice, AVPixelFormat format) {
+int hwframe_ctx(ctx_t &ctx, buffer_t &hwdevice, AVPixelFormat format, const encoder_t &encoder) {
   buffer_t frame_ref { av_hwframe_ctx_alloc(hwdevice.get()) };
 
-  auto frame_ctx               = (AVHWFramesContext *)frame_ref->data;
-  frame_ctx->format            = ctx->pix_fmt;
-  frame_ctx->sw_format         = format;
-  frame_ctx->height            = ctx->height;
-  frame_ctx->width             = ctx->width;
-  frame_ctx->initial_pool_size = 0;
+  auto frame_ctx       = (AVHWFramesContext *)frame_ref->data;
+  frame_ctx->format    = ctx->pix_fmt;
+  frame_ctx->sw_format = format;
+  frame_ctx->height    = ctx->height;
+  frame_ctx->width     = ctx->width;
+
+  if(encoder.hwframe_initial_pool_size >= 0) {
+    frame_ctx->initial_pool_size = encoder.hwframe_initial_pool_size;
+  }
 
   if(auto err = av_hwframe_ctx_init(frame_ref.get()); err < 0) {
     return err;
@@ -1704,14 +1751,14 @@ int hwframe_ctx(ctx_t &ctx, buffer_t &hwdevice, AVPixelFormat format) {
 }
 
 // Linux only declaration
-typedef int (*vaapi_make_hwdevice_ctx_fn)(platf::hwdevice_t *base, AVBufferRef **hw_device_buf);
+typedef int (*vaapi_make_hwdevice_ctx_fn)(platf::hwdevice_t *hwdevice_ctx, AVBufferRef **hw_device_buf);
 
-util::Either<buffer_t, int> vaapi_make_hwdevice_ctx(platf::hwdevice_t *base) {
+util::Either<buffer_t, int> vaapi_make_hwdevice_ctx(platf::hwdevice_t *hwdevice_ctx) {
   buffer_t hw_device_buf;
 
   // If an egl hwdevice
-  if(base->data) {
-    if(((vaapi_make_hwdevice_ctx_fn)base->data)(base, &hw_device_buf)) {
+  if(hwdevice_ctx->data) {
+    if(((vaapi_make_hwdevice_ctx_fn)hwdevice_ctx->data)(hwdevice_ctx, &hw_device_buf)) {
       return -1;
     }
 
@@ -1730,7 +1777,7 @@ util::Either<buffer_t, int> vaapi_make_hwdevice_ctx(platf::hwdevice_t *base) {
   return hw_device_buf;
 }
 
-util::Either<buffer_t, int> cuda_make_hwdevice_ctx(platf::hwdevice_t *base) {
+util::Either<buffer_t, int> cuda_make_hwdevice_ctx(platf::hwdevice_t *hwdevice_ctx) {
   buffer_t hw_device_buf;
 
   auto status = av_hwdevice_ctx_create(&hw_device_buf, AV_HWDEVICE_TYPE_CUDA, nullptr, nullptr, 1 /* AV_CUDA_USE_PRIMARY_CONTEXT */);
@@ -1774,6 +1821,31 @@ util::Either<buffer_t, int> dxgi_make_hwdevice_ctx(platf::hwdevice_t *hwdevice_c
 
   return ctx_buf;
 }
+
+util::Either<buffer_t, int> qsv_make_hwdevice_ctx(platf::hwdevice_t *hwdevice_ctx) {
+
+  AVBufferRef *hw_device_ctx = NULL;
+
+  AVDictionary *child_device_opts = NULL;
+
+  if(!config::video.qsv.child_device.empty()) {
+    av_dict_set(&child_device_opts, "child_device", config::video.qsv.child_device.data(), 0);
+  }
+
+  auto err = av_hwdevice_ctx_create(&hw_device_ctx, AV_HWDEVICE_TYPE_QSV, NULL, child_device_opts, 0);
+
+  if(err) {
+    char err_str[AV_ERROR_MAX_STRING_SIZE] { 0 };
+    BOOST_LOG(error) << "Failed to create FFMpeg hardware device context: "sv << av_make_error_string(err_str, AV_ERROR_MAX_STRING_SIZE, err);
+
+    return err;
+  }
+
+  buffer_t ctx_buf { hw_device_ctx };
+
+  return ctx_buf;
+}
+
 #endif
 
 int start_capture_async(capture_thread_async_ctx_t &capture_thread_ctx) {
@@ -1810,6 +1882,8 @@ platf::mem_type_e map_dev_type(AVHWDeviceType type) {
     return platf::mem_type_e::dxgi;
   case AV_HWDEVICE_TYPE_VAAPI:
     return platf::mem_type_e::vaapi;
+  case AV_HWDEVICE_TYPE_QSV:
+    return platf::mem_type_e::system;
   case AV_HWDEVICE_TYPE_CUDA:
     return platf::mem_type_e::cuda;
   case AV_HWDEVICE_TYPE_NONE:
diff --git a/sunshine/video.h b/sunshine/video.h
index fab4ff76837..ae07ae54ad2 100644
--- a/sunshine/video.h
+++ b/sunshine/video.h
@@ -27,8 +27,10 @@ struct packet_raw_t : public AVPacket {
     buf             = nullptr;
     side_data       = nullptr;
     side_data_elems = 0;
+    opaque          = nullptr;
+    opaque_ref      = nullptr;
   }
-
+  
   template<class P>
   explicit packet_raw_t(P *user_data) : channel_data { user_data } {
     init_packet();
diff --git a/third-party/cbs/cbs.c b/third-party/cbs/cbs.c
deleted file mode 100644
index 456cac20b03..00000000000
--- a/third-party/cbs/cbs.c
+++ /dev/null
@@ -1,1050 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <string.h>
-
-#include <libavutil/avassert.h>
-#include <libavutil/buffer.h>
-#include <libavutil/common.h>
-#include <libavutil/opt.h>
-
-#include <libavcodec/avcodec.h>
-
-#include "cbs/cbs.h"
-#include "cbs_internal.h"
-
-#include "get_bits.h"
-
-
-static const CodedBitstreamType *const cbs_type_table[] = {
-#if CONFIG_CBS_AV1
-  &ff_cbs_type_av1,
-#endif
-#if CONFIG_CBS_H264
-  &ff_cbs_type_h264,
-#endif
-#if CONFIG_CBS_H265
-  &ff_cbs_type_h265,
-#endif
-#if CONFIG_CBS_JPEG
-  &ff_cbs_type_jpeg,
-#endif
-#if CONFIG_CBS_MPEG2
-  &ff_cbs_type_mpeg2,
-#endif
-#if CONFIG_CBS_VP9
-  &ff_cbs_type_vp9,
-#endif
-};
-
-const enum AVCodecID ff_cbs_all_codec_ids[] = {
-#if CONFIG_CBS_AV1
-  AV_CODEC_ID_AV1,
-#endif
-#if CONFIG_CBS_H264
-  AV_CODEC_ID_H264,
-#endif
-#if CONFIG_CBS_H265
-  AV_CODEC_ID_H265,
-#endif
-#if CONFIG_CBS_JPEG
-  AV_CODEC_ID_MJPEG,
-#endif
-#if CONFIG_CBS_MPEG2
-  AV_CODEC_ID_MPEG2VIDEO,
-#endif
-#if CONFIG_CBS_VP9
-  AV_CODEC_ID_VP9,
-#endif
-  AV_CODEC_ID_NONE
-};
-
-int ff_cbs_init(CodedBitstreamContext **ctx_ptr,
-  enum AVCodecID codec_id, void *log_ctx) {
-  CodedBitstreamContext *ctx;
-  const CodedBitstreamType *type;
-  int i;
-
-  type = NULL;
-  for(i = 0; i < FF_ARRAY_ELEMS(cbs_type_table); i++) {
-    if(cbs_type_table[i]->codec_id == codec_id) {
-      type = cbs_type_table[i];
-      break;
-    }
-  }
-  if(!type)
-    return AVERROR(EINVAL);
-
-  ctx = av_mallocz(sizeof(*ctx));
-  if(!ctx)
-    return AVERROR(ENOMEM);
-
-  ctx->log_ctx = log_ctx;
-  ctx->codec   = type; /* Must be before any error */
-
-  if(type->priv_data_size) {
-    ctx->priv_data = av_mallocz(ctx->codec->priv_data_size);
-    if(!ctx->priv_data) {
-      av_freep(&ctx);
-      return AVERROR(ENOMEM);
-    }
-    if(type->priv_class) {
-      *(const AVClass **)ctx->priv_data = type->priv_class;
-      av_opt_set_defaults(ctx->priv_data);
-    }
-  }
-
-  ctx->decompose_unit_types = NULL;
-
-  ctx->trace_enable = 0;
-  ctx->trace_level  = AV_LOG_TRACE;
-
-  *ctx_ptr = ctx;
-  return 0;
-}
-
-void ff_cbs_flush(CodedBitstreamContext *ctx) {
-  if(ctx->codec->flush)
-    ctx->codec->flush(ctx);
-}
-
-void ff_cbs_close(CodedBitstreamContext **ctx_ptr) {
-  CodedBitstreamContext *ctx = *ctx_ptr;
-
-  if(!ctx)
-    return;
-
-  if(ctx->codec->close)
-    ctx->codec->close(ctx);
-
-  av_freep(&ctx->write_buffer);
-
-  if(ctx->codec->priv_class && ctx->priv_data)
-    av_opt_free(ctx->priv_data);
-
-  av_freep(&ctx->priv_data);
-  av_freep(ctx_ptr);
-}
-
-static void cbs_unit_uninit(CodedBitstreamUnit *unit) {
-  av_buffer_unref(&unit->content_ref);
-  unit->content = NULL;
-
-  av_buffer_unref(&unit->data_ref);
-  unit->data             = NULL;
-  unit->data_size        = 0;
-  unit->data_bit_padding = 0;
-}
-
-void ff_cbs_fragment_reset(CodedBitstreamFragment *frag) {
-  int i;
-
-  for(i = 0; i < frag->nb_units; i++)
-    cbs_unit_uninit(&frag->units[i]);
-  frag->nb_units = 0;
-
-  av_buffer_unref(&frag->data_ref);
-  frag->data             = NULL;
-  frag->data_size        = 0;
-  frag->data_bit_padding = 0;
-}
-
-void ff_cbs_fragment_free(CodedBitstreamFragment *frag) {
-  ff_cbs_fragment_reset(frag);
-
-  av_freep(&frag->units);
-  frag->nb_units_allocated = 0;
-}
-
-static int cbs_read_fragment_content(CodedBitstreamContext *ctx,
-  CodedBitstreamFragment *frag) {
-  int err, i, j;
-
-  for(i = 0; i < frag->nb_units; i++) {
-    CodedBitstreamUnit *unit = &frag->units[i];
-
-    if(ctx->decompose_unit_types) {
-      for(j = 0; j < ctx->nb_decompose_unit_types; j++) {
-        if(ctx->decompose_unit_types[j] == unit->type)
-          break;
-      }
-      if(j >= ctx->nb_decompose_unit_types)
-        continue;
-    }
-
-    av_buffer_unref(&unit->content_ref);
-    unit->content = NULL;
-
-    av_assert0(unit->data && unit->data_ref);
-
-    err = ctx->codec->read_unit(ctx, unit);
-    if(err == AVERROR(ENOSYS)) {
-      av_log(ctx->log_ctx, AV_LOG_VERBOSE,
-        "Decomposition unimplemented for unit %d "
-        "(type %" PRIu32 ").\n",
-        i, unit->type);
-    }
-    else if(err == AVERROR(EAGAIN)) {
-      av_log(ctx->log_ctx, AV_LOG_VERBOSE,
-        "Skipping decomposition of unit %d "
-        "(type %" PRIu32 ").\n",
-        i, unit->type);
-      av_buffer_unref(&unit->content_ref);
-      unit->content = NULL;
-    }
-    else if(err < 0) {
-      av_log(ctx->log_ctx, AV_LOG_ERROR, "Failed to read unit %d "
-                                         "(type %" PRIu32 ").\n",
-        i, unit->type);
-      return err;
-    }
-  }
-
-  return 0;
-}
-
-static int cbs_fill_fragment_data(CodedBitstreamFragment *frag,
-  const uint8_t *data, size_t size) {
-  av_assert0(!frag->data && !frag->data_ref);
-
-  frag->data_ref =
-    av_buffer_alloc(size + AV_INPUT_BUFFER_PADDING_SIZE);
-  if(!frag->data_ref)
-    return AVERROR(ENOMEM);
-
-  frag->data      = frag->data_ref->data;
-  frag->data_size = size;
-
-  memcpy(frag->data, data, size);
-  memset(frag->data + size, 0,
-    AV_INPUT_BUFFER_PADDING_SIZE);
-
-  return 0;
-}
-
-static int cbs_read_data(CodedBitstreamContext *ctx,
-  CodedBitstreamFragment *frag,
-  AVBufferRef *buf,
-  const uint8_t *data, size_t size,
-  int header) {
-  int err;
-
-  if(buf) {
-    frag->data_ref = av_buffer_ref(buf);
-    if(!frag->data_ref)
-      return AVERROR(ENOMEM);
-
-    frag->data      = (uint8_t *)data;
-    frag->data_size = size;
-  }
-  else {
-    err = cbs_fill_fragment_data(frag, data, size);
-    if(err < 0)
-      return err;
-  }
-
-  err = ctx->codec->split_fragment(ctx, frag, header);
-  if(err < 0)
-    return err;
-
-  return cbs_read_fragment_content(ctx, frag);
-}
-
-int ff_cbs_read_extradata(CodedBitstreamContext *ctx,
-  CodedBitstreamFragment *frag,
-  const AVCodecParameters *par) {
-  return cbs_read_data(ctx, frag, NULL,
-    par->extradata,
-    par->extradata_size, 1);
-}
-
-int ff_cbs_read_extradata_from_codec(CodedBitstreamContext *ctx,
-  CodedBitstreamFragment *frag,
-  const AVCodecContext *avctx) {
-  return cbs_read_data(ctx, frag, NULL,
-    avctx->extradata,
-    avctx->extradata_size, 1);
-}
-
-int ff_cbs_read_packet(CodedBitstreamContext *ctx,
-  CodedBitstreamFragment *frag,
-  const AVPacket *pkt) {
-  return cbs_read_data(ctx, frag, pkt->buf,
-    pkt->data, pkt->size, 0);
-}
-
-int ff_cbs_read(CodedBitstreamContext *ctx,
-  CodedBitstreamFragment *frag,
-  const uint8_t *data, size_t size) {
-  return cbs_read_data(ctx, frag, NULL,
-    data, size, 0);
-}
-
-static int cbs_write_unit_data(CodedBitstreamContext *ctx,
-  CodedBitstreamUnit *unit) {
-  PutBitContext pbc;
-  int ret;
-
-  if(!ctx->write_buffer) {
-    // Initial write buffer size is 1MB.
-    ctx->write_buffer_size = 1024 * 1024;
-
-  reallocate_and_try_again:
-    ret = av_reallocp(&ctx->write_buffer, ctx->write_buffer_size);
-    if(ret < 0) {
-      av_log(ctx->log_ctx, AV_LOG_ERROR, "Unable to allocate a "
-                                         "sufficiently large write buffer (last attempt "
-                                         "%zu bytes).\n",
-        ctx->write_buffer_size);
-      return ret;
-    }
-  }
-
-  init_put_bits(&pbc, ctx->write_buffer, ctx->write_buffer_size);
-
-  ret = ctx->codec->write_unit(ctx, unit, &pbc);
-  if(ret < 0) {
-    if(ret == AVERROR(ENOSPC)) {
-      // Overflow.
-      if(ctx->write_buffer_size == INT_MAX / 8)
-        return AVERROR(ENOMEM);
-      ctx->write_buffer_size = FFMIN(2 * ctx->write_buffer_size, INT_MAX / 8);
-      goto reallocate_and_try_again;
-    }
-    // Write failed for some other reason.
-    return ret;
-  }
-
-  // Overflow but we didn't notice.
-  av_assert0(put_bits_count(&pbc) <= 8 * ctx->write_buffer_size);
-
-  if(put_bits_count(&pbc) % 8)
-    unit->data_bit_padding = 8 - put_bits_count(&pbc) % 8;
-  else
-    unit->data_bit_padding = 0;
-
-  flush_put_bits(&pbc);
-
-  ret = ff_cbs_alloc_unit_data(unit, put_bytes_output(&pbc));
-  if(ret < 0)
-    return ret;
-
-  memcpy(unit->data, ctx->write_buffer, unit->data_size);
-
-  return 0;
-}
-
-int ff_cbs_write_fragment_data(CodedBitstreamContext *ctx,
-  CodedBitstreamFragment *frag) {
-  int err, i;
-
-  for(i = 0; i < frag->nb_units; i++) {
-    CodedBitstreamUnit *unit = &frag->units[i];
-
-    if(!unit->content)
-      continue;
-
-    av_buffer_unref(&unit->data_ref);
-    unit->data = NULL;
-
-    err = cbs_write_unit_data(ctx, unit);
-    if(err < 0) {
-      av_log(ctx->log_ctx, AV_LOG_ERROR, "Failed to write unit %d "
-                                         "(type %" PRIu32 ").\n",
-        i, unit->type);
-      return err;
-    }
-    av_assert0(unit->data && unit->data_ref);
-  }
-
-  av_buffer_unref(&frag->data_ref);
-  frag->data = NULL;
-
-  err = ctx->codec->assemble_fragment(ctx, frag);
-  if(err < 0) {
-    av_log(ctx->log_ctx, AV_LOG_ERROR, "Failed to assemble fragment.\n");
-    return err;
-  }
-  av_assert0(frag->data && frag->data_ref);
-
-  return 0;
-}
-
-int ff_cbs_write_extradata(CodedBitstreamContext *ctx,
-  AVCodecParameters *par,
-  CodedBitstreamFragment *frag) {
-  int err;
-
-  err = ff_cbs_write_fragment_data(ctx, frag);
-  if(err < 0)
-    return err;
-
-  av_freep(&par->extradata);
-
-  par->extradata = av_malloc(frag->data_size +
-                             AV_INPUT_BUFFER_PADDING_SIZE);
-  if(!par->extradata)
-    return AVERROR(ENOMEM);
-
-  memcpy(par->extradata, frag->data, frag->data_size);
-  memset(par->extradata + frag->data_size, 0,
-    AV_INPUT_BUFFER_PADDING_SIZE);
-  par->extradata_size = frag->data_size;
-
-  return 0;
-}
-
-int ff_cbs_write_packet(CodedBitstreamContext *ctx,
-  AVPacket *pkt,
-  CodedBitstreamFragment *frag) {
-  AVBufferRef *buf;
-  int err;
-
-  err = ff_cbs_write_fragment_data(ctx, frag);
-  if(err < 0)
-    return err;
-
-  buf = av_buffer_ref(frag->data_ref);
-  if(!buf)
-    return AVERROR(ENOMEM);
-
-  av_buffer_unref(&pkt->buf);
-
-  pkt->buf  = buf;
-  pkt->data = frag->data;
-  pkt->size = frag->data_size;
-
-  return 0;
-}
-
-
-void ff_cbs_trace_header(CodedBitstreamContext *ctx,
-  const char *name) {
-  if(!ctx->trace_enable)
-    return;
-
-  av_log(ctx->log_ctx, ctx->trace_level, "%s\n", name);
-}
-
-void ff_cbs_trace_syntax_element(CodedBitstreamContext *ctx, int position,
-  const char *str, const int *subscripts,
-  const char *bits, int64_t value) {
-  char name[256];
-  size_t name_len, bits_len;
-  int pad, subs, i, j, k, n;
-
-  if(!ctx->trace_enable)
-    return;
-
-  av_assert0(value >= INT_MIN && value <= UINT32_MAX);
-
-  subs = subscripts ? subscripts[0] : 0;
-  n    = 0;
-  for(i = j = 0; str[i];) {
-    if(str[i] == '[') {
-      if(n < subs) {
-        ++n;
-        k = snprintf(name + j, sizeof(name) - j, "[%d", subscripts[n]);
-        av_assert0(k > 0 && j + k < sizeof(name));
-        j += k;
-        for(++i; str[i] && str[i] != ']'; i++)
-          ;
-        av_assert0(str[i] == ']');
-      }
-      else {
-        while(str[i] && str[i] != ']')
-          name[j++] = str[i++];
-        av_assert0(str[i] == ']');
-      }
-    }
-    else {
-      av_assert0(j + 1 < sizeof(name));
-      name[j++] = str[i++];
-    }
-  }
-  av_assert0(j + 1 < sizeof(name));
-  name[j] = 0;
-  av_assert0(n == subs);
-
-  name_len = strlen(name);
-  bits_len = strlen(bits);
-
-  if(name_len + bits_len > 60)
-    pad = bits_len + 2;
-  else
-    pad = 61 - name_len;
-
-  av_log(ctx->log_ctx, ctx->trace_level, "%-10d  %s%*s = %" PRId64 "\n",
-    position, name, pad, bits, value);
-}
-
-int ff_cbs_read_unsigned(CodedBitstreamContext *ctx, GetBitContext *gbc,
-  int width, const char *name,
-  const int *subscripts, uint32_t *write_to,
-  uint32_t range_min, uint32_t range_max) {
-  uint32_t value;
-  int position;
-
-  av_assert0(width > 0 && width <= 32);
-
-  if(get_bits_left(gbc) < width) {
-    av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid value at "
-                                       "%s: bitstream ended.\n",
-      name);
-    return AVERROR_INVALIDDATA;
-  }
-
-  if(ctx->trace_enable)
-    position = get_bits_count(gbc);
-
-  value = get_bits_long(gbc, width);
-
-  if(ctx->trace_enable) {
-    char bits[33];
-    int i;
-    for(i = 0; i < width; i++)
-      bits[i] = value >> (width - i - 1) & 1 ? '1' : '0';
-    bits[i] = 0;
-
-    ff_cbs_trace_syntax_element(ctx, position, name, subscripts,
-      bits, value);
-  }
-
-  if(value < range_min || value > range_max) {
-    av_log(ctx->log_ctx, AV_LOG_ERROR, "%s out of range: "
-                                       "%" PRIu32 ", but must be in [%" PRIu32 ",%" PRIu32 "].\n",
-      name, value, range_min, range_max);
-    return AVERROR_INVALIDDATA;
-  }
-
-  *write_to = value;
-  return 0;
-}
-
-int ff_cbs_write_unsigned(CodedBitstreamContext *ctx, PutBitContext *pbc,
-  int width, const char *name,
-  const int *subscripts, uint32_t value,
-  uint32_t range_min, uint32_t range_max) {
-  av_assert0(width > 0 && width <= 32);
-
-  if(value < range_min || value > range_max) {
-    av_log(ctx->log_ctx, AV_LOG_ERROR, "%s out of range: "
-                                       "%" PRIu32 ", but must be in [%" PRIu32 ",%" PRIu32 "].\n",
-      name, value, range_min, range_max);
-    return AVERROR_INVALIDDATA;
-  }
-
-  if(put_bits_left(pbc) < width)
-    return AVERROR(ENOSPC);
-
-  if(ctx->trace_enable) {
-    char bits[33];
-    int i;
-    for(i = 0; i < width; i++)
-      bits[i] = value >> (width - i - 1) & 1 ? '1' : '0';
-    bits[i] = 0;
-
-    ff_cbs_trace_syntax_element(ctx, put_bits_count(pbc),
-      name, subscripts, bits, value);
-  }
-
-  if(width < 32)
-    put_bits(pbc, width, value);
-  else
-    put_bits32(pbc, value);
-
-  return 0;
-}
-
-int ff_cbs_read_signed(CodedBitstreamContext *ctx, GetBitContext *gbc,
-  int width, const char *name,
-  const int *subscripts, int32_t *write_to,
-  int32_t range_min, int32_t range_max) {
-  int32_t value;
-  int position;
-
-  av_assert0(width > 0 && width <= 32);
-
-  if(get_bits_left(gbc) < width) {
-    av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid value at "
-                                       "%s: bitstream ended.\n",
-      name);
-    return AVERROR_INVALIDDATA;
-  }
-
-  if(ctx->trace_enable)
-    position = get_bits_count(gbc);
-
-  value = get_sbits_long(gbc, width);
-
-  if(ctx->trace_enable) {
-    char bits[33];
-    int i;
-    for(i = 0; i < width; i++)
-      bits[i] = value & (1U << (width - i - 1)) ? '1' : '0';
-    bits[i] = 0;
-
-    ff_cbs_trace_syntax_element(ctx, position, name, subscripts,
-      bits, value);
-  }
-
-  if(value < range_min || value > range_max) {
-    av_log(ctx->log_ctx, AV_LOG_ERROR, "%s out of range: "
-                                       "%" PRId32 ", but must be in [%" PRId32 ",%" PRId32 "].\n",
-      name, value, range_min, range_max);
-    return AVERROR_INVALIDDATA;
-  }
-
-  *write_to = value;
-  return 0;
-}
-
-int ff_cbs_write_signed(CodedBitstreamContext *ctx, PutBitContext *pbc,
-  int width, const char *name,
-  const int *subscripts, int32_t value,
-  int32_t range_min, int32_t range_max) {
-  av_assert0(width > 0 && width <= 32);
-
-  if(value < range_min || value > range_max) {
-    av_log(ctx->log_ctx, AV_LOG_ERROR, "%s out of range: "
-                                       "%" PRId32 ", but must be in [%" PRId32 ",%" PRId32 "].\n",
-      name, value, range_min, range_max);
-    return AVERROR_INVALIDDATA;
-  }
-
-  if(put_bits_left(pbc) < width)
-    return AVERROR(ENOSPC);
-
-  if(ctx->trace_enable) {
-    char bits[33];
-    int i;
-    for(i = 0; i < width; i++)
-      bits[i] = value & (1U << (width - i - 1)) ? '1' : '0';
-    bits[i] = 0;
-
-    ff_cbs_trace_syntax_element(ctx, put_bits_count(pbc),
-      name, subscripts, bits, value);
-  }
-
-  if(width < 32)
-    put_sbits(pbc, width, value);
-  else
-    put_bits32(pbc, value);
-
-  return 0;
-}
-
-
-int ff_cbs_alloc_unit_content(CodedBitstreamUnit *unit,
-  size_t size,
-  void (*free)(void *opaque, uint8_t *data)) {
-  av_assert0(!unit->content && !unit->content_ref);
-
-  unit->content = av_mallocz(size);
-  if(!unit->content)
-    return AVERROR(ENOMEM);
-
-  unit->content_ref = av_buffer_create(unit->content, size,
-    free, NULL, 0);
-  if(!unit->content_ref) {
-    av_freep(&unit->content);
-    return AVERROR(ENOMEM);
-  }
-
-  return 0;
-}
-
-int ff_cbs_alloc_unit_data(CodedBitstreamUnit *unit,
-  size_t size) {
-  av_assert0(!unit->data && !unit->data_ref);
-
-  unit->data_ref = av_buffer_alloc(size + AV_INPUT_BUFFER_PADDING_SIZE);
-  if(!unit->data_ref)
-    return AVERROR(ENOMEM);
-
-  unit->data      = unit->data_ref->data;
-  unit->data_size = size;
-
-  memset(unit->data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
-
-  return 0;
-}
-
-static int cbs_insert_unit(CodedBitstreamFragment *frag,
-  int position) {
-  CodedBitstreamUnit *units;
-
-  if(frag->nb_units < frag->nb_units_allocated) {
-    units = frag->units;
-
-    if(position < frag->nb_units)
-      memmove(units + position + 1, units + position,
-        (frag->nb_units - position) * sizeof(*units));
-  }
-  else {
-    units = av_malloc_array(frag->nb_units * 2 + 1, sizeof(*units));
-    if(!units)
-      return AVERROR(ENOMEM);
-
-    frag->nb_units_allocated = 2 * frag->nb_units_allocated + 1;
-
-    if(position > 0)
-      memcpy(units, frag->units, position * sizeof(*units));
-
-    if(position < frag->nb_units)
-      memcpy(units + position + 1, frag->units + position,
-        (frag->nb_units - position) * sizeof(*units));
-  }
-
-  memset(units + position, 0, sizeof(*units));
-
-  if(units != frag->units) {
-    av_free(frag->units);
-    frag->units = units;
-  }
-
-  ++frag->nb_units;
-
-  return 0;
-}
-
-int ff_cbs_insert_unit_content(CodedBitstreamFragment *frag,
-  int position,
-  CodedBitstreamUnitType type,
-  void *content,
-  AVBufferRef *content_buf) {
-  CodedBitstreamUnit *unit;
-  AVBufferRef *content_ref;
-  int err;
-
-  if(position == -1)
-    position = frag->nb_units;
-  av_assert0(position >= 0 && position <= frag->nb_units);
-
-  if(content_buf) {
-    content_ref = av_buffer_ref(content_buf);
-    if(!content_ref)
-      return AVERROR(ENOMEM);
-  }
-  else {
-    content_ref = NULL;
-  }
-
-  err = cbs_insert_unit(frag, position);
-  if(err < 0) {
-    av_buffer_unref(&content_ref);
-    return err;
-  }
-
-  unit              = &frag->units[position];
-  unit->type        = type;
-  unit->content     = content;
-  unit->content_ref = content_ref;
-
-  return 0;
-}
-
-int ff_cbs_insert_unit_data(CodedBitstreamFragment *frag,
-  int position,
-  CodedBitstreamUnitType type,
-  uint8_t *data, size_t data_size,
-  AVBufferRef *data_buf) {
-  CodedBitstreamUnit *unit;
-  AVBufferRef *data_ref;
-  int err;
-
-  if(position == -1)
-    position = frag->nb_units;
-  av_assert0(position >= 0 && position <= frag->nb_units);
-
-  if(data_buf)
-    data_ref = av_buffer_ref(data_buf);
-  else
-    data_ref = av_buffer_create(data, data_size, NULL, NULL, 0);
-  if(!data_ref) {
-    if(!data_buf)
-      av_free(data);
-    return AVERROR(ENOMEM);
-  }
-
-  err = cbs_insert_unit(frag, position);
-  if(err < 0) {
-    av_buffer_unref(&data_ref);
-    return err;
-  }
-
-  unit            = &frag->units[position];
-  unit->type      = type;
-  unit->data      = data;
-  unit->data_size = data_size;
-  unit->data_ref  = data_ref;
-
-  return 0;
-}
-
-void ff_cbs_delete_unit(CodedBitstreamFragment *frag,
-  int position) {
-  av_assert0(0 <= position && position < frag->nb_units && "Unit to be deleted not in fragment.");
-
-  cbs_unit_uninit(&frag->units[position]);
-
-  --frag->nb_units;
-
-  if(frag->nb_units > 0)
-    memmove(frag->units + position,
-      frag->units + position + 1,
-      (frag->nb_units - position) * sizeof(*frag->units));
-}
-
-static void cbs_default_free_unit_content(void *opaque, uint8_t *data) {
-  const CodedBitstreamUnitTypeDescriptor *desc = opaque;
-  if(desc->content_type == CBS_CONTENT_TYPE_INTERNAL_REFS) {
-    int i;
-    for(i = 0; i < desc->nb_ref_offsets; i++) {
-      void **ptr = (void **)(data + desc->ref_offsets[i]);
-      av_buffer_unref((AVBufferRef **)(ptr + 1));
-    }
-  }
-  av_free(data);
-}
-
-static const CodedBitstreamUnitTypeDescriptor
-  *
-  cbs_find_unit_type_desc(CodedBitstreamContext *ctx,
-    CodedBitstreamUnit *unit) {
-  const CodedBitstreamUnitTypeDescriptor *desc;
-  int i, j;
-
-  if(!ctx->codec->unit_types)
-    return NULL;
-
-  for(i = 0;; i++) {
-    desc = &ctx->codec->unit_types[i];
-    if(desc->nb_unit_types == 0)
-      break;
-    if(desc->nb_unit_types == CBS_UNIT_TYPE_RANGE) {
-      if(unit->type >= desc->unit_type_range_start &&
-         unit->type <= desc->unit_type_range_end)
-        return desc;
-    }
-    else {
-      for(j = 0; j < desc->nb_unit_types; j++) {
-        if(desc->unit_types[j] == unit->type)
-          return desc;
-      }
-    }
-  }
-  return NULL;
-}
-
-int ff_cbs_alloc_unit_content2(CodedBitstreamContext *ctx,
-  CodedBitstreamUnit *unit) {
-  const CodedBitstreamUnitTypeDescriptor *desc;
-
-  av_assert0(!unit->content && !unit->content_ref);
-
-  desc = cbs_find_unit_type_desc(ctx, unit);
-  if(!desc)
-    return AVERROR(ENOSYS);
-
-  unit->content = av_mallocz(desc->content_size);
-  if(!unit->content)
-    return AVERROR(ENOMEM);
-
-  unit->content_ref =
-    av_buffer_create(unit->content, desc->content_size,
-      desc->content_free ? desc->content_free : cbs_default_free_unit_content,
-      (void *)desc, 0);
-  if(!unit->content_ref) {
-    av_freep(&unit->content);
-    return AVERROR(ENOMEM);
-  }
-
-  return 0;
-}
-
-static int cbs_clone_unit_content(AVBufferRef **clone_ref,
-  CodedBitstreamUnit *unit,
-  const CodedBitstreamUnitTypeDescriptor *desc) {
-  uint8_t *src, *copy;
-  uint8_t **src_ptr, **copy_ptr;
-  AVBufferRef **src_buf, **copy_buf;
-  int err, i;
-
-  av_assert0(unit->content);
-  src = unit->content;
-
-  copy = av_memdup(src, desc->content_size);
-  if(!copy)
-    return AVERROR(ENOMEM);
-
-  for(i = 0; i < desc->nb_ref_offsets; i++) {
-    src_ptr  = (uint8_t **)(src + desc->ref_offsets[i]);
-    src_buf  = (AVBufferRef **)(src_ptr + 1);
-    copy_ptr = (uint8_t **)(copy + desc->ref_offsets[i]);
-    copy_buf = (AVBufferRef **)(copy_ptr + 1);
-
-    if(!*src_ptr) {
-      av_assert0(!*src_buf);
-      continue;
-    }
-    if(!*src_buf) {
-      // We can't handle a non-refcounted pointer here - we don't
-      // have enough information to handle whatever structure lies
-      // at the other end of it.
-      err = AVERROR(EINVAL);
-      goto fail;
-    }
-
-    // src_ptr is required to point somewhere inside src_buf.  If it
-    // doesn't, there is a bug somewhere.
-    av_assert0(*src_ptr >= (*src_buf)->data &&
-               *src_ptr < (*src_buf)->data + (*src_buf)->size);
-
-    *copy_buf = av_buffer_ref(*src_buf);
-    if(!*copy_buf) {
-      err = AVERROR(ENOMEM);
-      goto fail;
-    }
-    *copy_ptr = (*copy_buf)->data + (*src_ptr - (*src_buf)->data);
-  }
-
-  *clone_ref = av_buffer_create(copy, desc->content_size,
-    desc->content_free ? desc->content_free :
-                         cbs_default_free_unit_content,
-    (void *)desc, 0);
-  if(!*clone_ref) {
-    err = AVERROR(ENOMEM);
-    goto fail;
-  }
-
-  return 0;
-
-fail:
-  for(--i; i >= 0; i--)
-    av_buffer_unref((AVBufferRef **)(copy + desc->ref_offsets[i]));
-  av_freep(&copy);
-  *clone_ref = NULL;
-  return err;
-}
-
-int ff_cbs_make_unit_refcounted(CodedBitstreamContext *ctx,
-  CodedBitstreamUnit *unit) {
-  const CodedBitstreamUnitTypeDescriptor *desc;
-  AVBufferRef *ref;
-  int err;
-
-  av_assert0(unit->content);
-  if(unit->content_ref) {
-    // Already refcounted, nothing to do.
-    return 0;
-  }
-
-  desc = cbs_find_unit_type_desc(ctx, unit);
-  if(!desc)
-    return AVERROR(ENOSYS);
-
-  switch(desc->content_type) {
-  case CBS_CONTENT_TYPE_POD:
-    ref = av_buffer_alloc(desc->content_size);
-    if(!ref)
-      return AVERROR(ENOMEM);
-    memcpy(ref->data, unit->content, desc->content_size);
-    err = 0;
-    break;
-
-  case CBS_CONTENT_TYPE_INTERNAL_REFS:
-    err = cbs_clone_unit_content(&ref, unit, desc);
-    break;
-
-  case CBS_CONTENT_TYPE_COMPLEX:
-    if(!desc->content_clone)
-      return AVERROR_PATCHWELCOME;
-    err = desc->content_clone(&ref, unit);
-    break;
-
-  default:
-    av_assert0(0 && "Invalid content type.");
-  }
-
-  if(err < 0)
-    return err;
-
-  unit->content_ref = ref;
-  unit->content     = ref->data;
-  return 0;
-}
-
-int ff_cbs_make_unit_writable(CodedBitstreamContext *ctx,
-  CodedBitstreamUnit *unit) {
-  const CodedBitstreamUnitTypeDescriptor *desc;
-  AVBufferRef *ref;
-  int err;
-
-  // This can only be applied to refcounted units.
-  err = ff_cbs_make_unit_refcounted(ctx, unit);
-  if(err < 0)
-    return err;
-  av_assert0(unit->content && unit->content_ref);
-
-  if(av_buffer_is_writable(unit->content_ref))
-    return 0;
-
-  desc = cbs_find_unit_type_desc(ctx, unit);
-  if(!desc)
-    return AVERROR(ENOSYS);
-
-  switch(desc->content_type) {
-  case CBS_CONTENT_TYPE_POD:
-    err = av_buffer_make_writable(&unit->content_ref);
-    break;
-
-  case CBS_CONTENT_TYPE_INTERNAL_REFS:
-    err = cbs_clone_unit_content(&ref, unit, desc);
-    break;
-
-  case CBS_CONTENT_TYPE_COMPLEX:
-    if(!desc->content_clone)
-      return AVERROR_PATCHWELCOME;
-    err = desc->content_clone(&ref, unit);
-    break;
-
-  default:
-    av_assert0(0 && "Invalid content type.");
-  }
-  if(err < 0)
-    return err;
-
-  if(desc->content_type != CBS_CONTENT_TYPE_POD) {
-    av_buffer_unref(&unit->content_ref);
-    unit->content_ref = ref;
-  }
-  unit->content = unit->content_ref->data;
-  return 0;
-}
-
-const uint8_t ff_log2_tab[256] = {
-  0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
-};
\ No newline at end of file