Merge commit '80ea66112817c719b476de8f7d8d3b325f4c7dd1'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:51:53 +0000 (10:51 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:59:06 +0000 (10:59 +0200)
commitdb395bef7f9a0c8af782835aefb358e56c6bfb46
treec88f4f21d5470604eeac0096ca7b649446a7de84
parent2ab827389bc17972dfe58b768083593b1f1bf776
parent80ea66112817c719b476de8f7d8d3b325f4c7dd1
Merge commit '80ea66112817c719b476de8f7d8d3b325f4c7dd1'

* commit '80ea66112817c719b476de8f7d8d3b325f4c7dd1':
  avcodec: h264: Extract decoder methods

Conflicts:
libavcodec/h264_sei.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/h264_sei.c