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/dxva2_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/dxva2_h264.c')
| -rw-r--r-- | libavcodec/dxva2_h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c index bd1fa1ee71..a6aa0f66cc 100644 --- a/libavcodec/dxva2_h264.c +++ b/libavcodec/dxva2_h264.c @@ -145,7 +145,7 @@ static void fill_picture_parameters(const AVCodecContext *avctx, AVDXVAContext * pp->num_ref_idx_l0_active_minus1 = pps->ref_count[0] - 1; pp->num_ref_idx_l1_active_minus1 = pps->ref_count[1] - 1; pp->Reserved8BitsA = 0; - pp->frame_num = h->frame_num; + pp->frame_num = h->poc.frame_num; pp->log2_max_frame_num_minus4 = sps->log2_max_frame_num - 4; pp->pic_order_cnt_type = sps->poc_type; if (sps->poc_type == 0) |