Merge commit 'fd124d8357b1becfde3ac8d5e3320127cf97a5b7'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jul 2015 02:19:42 +0000 (04:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jul 2015 02:50:00 +0000 (04:50 +0200)
commit1d4194e69696e615b5bbf7273103b05241dc75b8
tree4684f6e817a8314e882fa6a73c89fa2e5f9f3798
parentc11810166205bbf68f114414329e679b0d2d5268
parentfd124d8357b1becfde3ac8d5e3320127cf97a5b7
Merge commit 'fd124d8357b1becfde3ac8d5e3320127cf97a5b7'

* commit 'fd124d8357b1becfde3ac8d5e3320127cf97a5b7':
  hevc_ps: split the code for parsing the SPS and exporting it into the context

Conflicts:
libavcodec/hevc.c
libavcodec/hevc_ps.c

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