Merge commit '7b50d60442af8d9527e9da46818011fe15a5265a'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 13:17:16 +0000 (15:17 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 13:17:16 +0000 (15:17 +0200)
commit527a57932765f493529449f13d0d79ee5c7116e1
tree24b8ac0e0708d756c12d0167709cc41a003ea1fc
parentd7a2451688442d2736f4811267277c7051f414a6
parent7b50d60442af8d9527e9da46818011fe15a5265a
Merge commit '7b50d60442af8d9527e9da46818011fe15a5265a'

* commit '7b50d60442af8d9527e9da46818011fe15a5265a':
  h264: call ff_h264_fill_mbaff_ref_list() when constructing the normal ref list

Merged-by: Clément Bœsch <clement@stupeflix.com>
libavcodec/h264.h
libavcodec/h264_refs.c
libavcodec/h264_slice.c