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)
* commit 'a0e1c3517a656dd32293f054a339e0ac73328138':
  hevc: remove unused array min_cb_addr_zs

Conflicts:
libavcodec/hevc_ps.c

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

Trivial merge