Merge commit 'a0e1c3517a656dd32293f054a339e0ac73328138'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 18:10:01 +0000 (20:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 18:10:01 +0000 (20:10 +0200)
commit932be89c26d71244a5d78378c2c32a826ed6a31e
tree1d16c5912fa1551574b4df137fe57b8d7bc5d545
parentacc7cf70dc09ec3e425f7c4fa5e0be427b3f0790
parenta0e1c3517a656dd32293f054a339e0ac73328138
Merge commit 'a0e1c3517a656dd32293f054a339e0ac73328138'

* commit 'a0e1c3517a656dd32293f054a339e0ac73328138':
  hevc: remove unused array min_cb_addr_zs

Conflicts:
libavcodec/hevc_ps.c

See: f7f1f4c7ce9ce689823e13a53b694eb14cbbf6e7
Merged-by: Michael Niedermayer <michaelni@gmx.at>