Merge commit '9a026c72982faf20e1c8dfbe48f0b312cdea69c8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 15:15:03 +0000 (16:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 15:17:38 +0000 (16:17 +0100)
commit7ee8a1c562e8de3bf9627ff10bfb744392c018b7
treeec9d423cfaf4e78f268333ec213d0b784cf7d9bc
parenta4f8a5649561906ccad7f15247f033e7b8df4a4e
parent9a026c72982faf20e1c8dfbe48f0b312cdea69c8
Merge commit '9a026c72982faf20e1c8dfbe48f0b312cdea69c8'

* commit '9a026c72982faf20e1c8dfbe48f0b312cdea69c8':
  h264: rebuild the default ref list if the reference count changes

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c