Merge commit 'a062a55d37720abc8c704aa0e8682efd3cdc9c9b'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 13 Jul 2015 15:04:13 +0000 (17:04 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 13 Jul 2015 15:04:13 +0000 (17:04 +0200)
commit5be07d0206916bf9119e5f4255c528aac1621406
tree943896002a30ce776515e4d2693062e70f2f008c
parent1127b35ff100983dc15d5b0929c98554afed8300
parenta062a55d37720abc8c704aa0e8682efd3cdc9c9b
Merge commit 'a062a55d37720abc8c704aa0e8682efd3cdc9c9b'

* commit 'a062a55d37720abc8c704aa0e8682efd3cdc9c9b':
  hevc_parser: fix standalone build with the hevc decoder disabled

Conflicts:
libavcodec/Makefile
libavcodec/hevc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/Makefile
libavcodec/hevc_cabac.c
libavcodec/hevc_data.c