Merge commit 'f450cc7bc595155bacdb9f5d2414a076ccf81b4a'
authorMatthieu Bouron <matthieu.bouron@gmail.com>
Mon, 16 Jan 2017 10:33:47 +0000 (11:33 +0100)
committerMatthieu Bouron <matthieu.bouron@gmail.com>
Tue, 17 Jan 2017 13:38:48 +0000 (14:38 +0100)
commitbdbbb8f11edbf10add874508c5125c174d8939be
tree4807af0adc9d4db820da985d408a0a9fa465c61a
parentadf5dc90a951bd1a94647f3e8bf79271a5e98e0e
parentf450cc7bc595155bacdb9f5d2414a076ccf81b4a
Merge commit 'f450cc7bc595155bacdb9f5d2414a076ccf81b4a'

* commit 'f450cc7bc595155bacdb9f5d2414a076ccf81b4a':
  h264: eliminate decode_postinit()

Also includes fixes from 1f7b4f9abc and e344e65109.

Original patch replace H264Context.next_output_pic (H264Picture *) by
H264Context.output_frame (AVFrame *). This change is discarded as it
is incompatible with the frame reconstruction and motion vectors
display code which needs the extra information from the H264Picture.

Merged-by: Clément Bœsch <u@pkh.me>
Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
libavcodec/h264_slice.c
libavcodec/h264dec.c