2 files changed, 9 insertions, 2 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index de76ba062e..560d52c458 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -2657,8 +2657,10 @@ static int extract_rbsp(const uint8_t *src, int length,
 #endif /* HAVE_FAST_UNALIGNED */
 
     if (i >= length - 1) { // no escaped 0
-        nal->data = src;
-        nal->size = length;
+        nal->data     =
+        nal->raw_data = src;
+        nal->size     =
+        nal->raw_size = length;
         return length;
     }
 
@@ -2697,6 +2699,8 @@ nsc:
 
     nal->data = dst;
     nal->size = di;
+    nal->raw_data = src;
+    nal->raw_size = si;
     return si;
 }
 
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index 37131cd726..c4162e7353 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -692,6 +692,9 @@ typedef struct HEVCNAL {
 
     int size;
     const uint8_t *data;
+
+    int raw_size;
+    const uint8_t *raw_data;
 } HEVCNAL;
 
 struct HEVCContext;