diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-12 16:06:58 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-12 19:01:43 +0200 |
| commit | bd3fd467febe92300e0ebf8ff13c193f9236479a (patch) | |
| tree | e2a4382598405ce35492ec3c69e007e36f9b5e6c /libavcodec/vaapi_h264.c | |
| parent | 65d5f32fd7d234a9b08e3743593de0a72af7c03c (diff) | |
| parent | c8dcff0cdb17d0aa03ac729eba12d1a20f1f59c8 (diff) | |
| download | ffmpeg-bd3fd467febe92300e0ebf8ff13c193f9236479a.tar.gz | |
Merge commit 'c8dcff0cdb17d0aa03ac729eba12d1a20f1f59c8'
* commit 'c8dcff0cdb17d0aa03ac729eba12d1a20f1f59c8':
h264: factor out calculating the POC count into a separate file
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/vaapi_h264.c')
| -rw-r--r-- | libavcodec/vaapi_h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index 9b13fa9877..91ee2d60c7 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -279,7 +279,7 @@ static int vaapi_h264_start_frame(AVCodecContext *avctx, pic_param->pic_fields.bits.deblocking_filter_control_present_flag = pps->deblocking_filter_parameters_present; pic_param->pic_fields.bits.redundant_pic_cnt_present_flag = pps->redundant_pic_cnt_present; pic_param->pic_fields.bits.reference_pic_flag = h->nal_ref_idc != 0; - pic_param->frame_num = h->frame_num; + pic_param->frame_num = h->poc.frame_num; /* Fill in VAIQMatrixBufferH264. */ iq_matrix = ff_vaapi_alloc_iq_matrix(vactx, sizeof(VAIQMatrixBufferH264)); |