diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 13:48:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 14:13:19 +0200 |
| commit | 441d5a7084b56fd9874daede2ef90356b3bf9d16 (patch) | |
| tree | 8bce92071141b185bcd67abbb0cc1cf9429340b5 /libavcodec/h264.h | |
| parent | ec6bef68f14f08e1295ea9c65fcb8b3f2e53193e (diff) | |
| parent | b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37 (diff) | |
| download | ffmpeg-streaming-441d5a7084b56fd9874daede2ef90356b3bf9d16.zip ffmpeg-streaming-441d5a7084b56fd9874daede2ef90356b3bf9d16.tar.gz | |
Merge commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37'
* commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37':
h264: Add support for Closed Caption export
Conflicts:
libavcodec/h264.c
libavcodec/h264_sei.c
See: 8234f0e3b485811d60c228c40a94a141c46e61ca
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 11a9125..2b5029a 100644 --- 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 |
