Merge commit '58640fe89ec4f2a3d67c0a2585fca8de34440857'
authorTimothy Gu <timothygu99@gmail.com>
Thu, 4 Aug 2016 03:07:21 +0000 (20:07 -0700)
committerTimothy Gu <timothygu99@gmail.com>
Thu, 4 Aug 2016 03:07:21 +0000 (20:07 -0700)
commit7f7cedd7139f18480e3dacd1abcfd94bda01fa17
tree014f7506d73757e0254209daa54744e8170ca32a
parentde625312862a99500ce7aa1703b5d783ae66d704
parent58640fe89ec4f2a3d67c0a2585fca8de34440857
Merge commit '58640fe89ec4f2a3d67c0a2585fca8de34440857'

* commit '58640fe89ec4f2a3d67c0a2585fca8de34440857':
  h264: handle frame recovery in h264_field_start()

Conflicts:
libavcodec/h264dec.c

Merged-by: Timothy Gu <timothygu99@gmail.com>
libavcodec/h264_slice.c
libavcodec/h264dec.c