Merge commit 'c8dcff0cdb17d0aa03ac729eba12d1a20f1f59c8'
authorClément Bœsch <u@pkh.me>
Sun, 12 Jun 2016 14:06:58 +0000 (16:06 +0200)
committerClément Bœsch <u@pkh.me>
Sun, 12 Jun 2016 17:01:43 +0000 (19:01 +0200)
commitbd3fd467febe92300e0ebf8ff13c193f9236479a
treee2a4382598405ce35492ec3c69e007e36f9b5e6c
parent65d5f32fd7d234a9b08e3743593de0a72af7c03c
parentc8dcff0cdb17d0aa03ac729eba12d1a20f1f59c8
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>
12 files changed:
libavcodec/dxva2_h264.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_parse.c
libavcodec/h264_parse.h
libavcodec/h264_parser.c
libavcodec/h264_picture.c
libavcodec/h264_refs.c
libavcodec/h264_slice.c
libavcodec/vaapi_h264.c
libavcodec/vdpau.c
libavcodec/vdpau_h264.c