Merge commit 'efc618aff9d68d2ddc323a5c5f892ac71951f162'

[ffmpeg] / libavcodec / h264.h

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 11a9125a13aaeee24e9fcdc5ee1d2f4846739285..2b5029a74919cc2dcecfb75631f95521f3d15fc9 100644 (file)
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -746,6 +746,8 @@ typedef struct H264Context {
      */
     int sei_reguserdata_afd_present;
     uint8_t active_format_description;
+    int a53_caption_size;
+    uint8_t *a53_caption;
 
     /**
      * Bit set of clock types for fields/frames in picture timing SEI message.
@@ -805,9 +807,6 @@ typedef struct H264Context {
 
     int missing_fields;
 
-    int a53_caption_size;
-    uint8_t *a53_caption;
-
 /* for frame threading, this is set to 1
      * after finish_setup() has been called, so we cannot modify
      * some context properties (which are supposed to stay constant between