diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 22:51:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-30 22:54:33 +0200 |
| commit | 7e9c7b623f051eea2e9565a260dae071f873cb42 (patch) | |
| tree | e1d8eba0aa2b89355ee28c9bcc0af207320afaf6 /libavcodec/h264.c | |
| parent | 8e6c5c4322367ab066bbb0134eac5ee9c1aafdc3 (diff) | |
| parent | 271ce76d317c5432e151216cf23f12b77ed6cb7e (diff) | |
| download | ffmpeg-7e9c7b623f051eea2e9565a260dae071f873cb42.tar.gz | |
Merge commit '271ce76d317c5432e151216cf23f12b77ed6cb7e'
* commit '271ce76d317c5432e151216cf23f12b77ed6cb7e':
h264: Parse registered data SEI message and AFD value
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_sei.c
libavcodec/version.h
See: d6e95669496a89d186f923c34bcaf7d86b7cd59c
See: 22291c372fa703242e8429bed61700ba81258f19
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 818ee06803..baedcf4243 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -608,7 +608,6 @@ static int h264_init_context(AVCodecContext *avctx, H264Context *h) h->frame_recovered = 0; h->prev_frame_num = -1; h->sei_fpa.frame_packing_arrangement_cancel_flag = -1; - h->has_afd = 0; h->next_outputed_poc = INT_MIN; for (i = 0; i < MAX_DELAYED_PIC_COUNT; i++) @@ -870,12 +869,13 @@ static void decode_postinit(H264Context *h, int setup_finished) } } - if (h->has_afd) { - AVFrameSideData *sd = - av_frame_new_side_data(cur->f, AV_FRAME_DATA_AFD, 1); + if (h->sei_reguserdata_afd_present) { + AVFrameSideData *sd = av_frame_new_side_data(cur->f, AV_FRAME_DATA_AFD, + sizeof(uint8_t)); + if (sd) { - *sd->data = h->afd; - h->has_afd = 0; + *sd->data = h->active_format_description; + h->sei_reguserdata_afd_present = 0; } } |