Merge commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 12:54:49 +0000 (13:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 12:55:15 +0000 (13:55 +0100)
commit183bffb3a3c4bbb4b4a87bd68e7b4627f2af4f1b
tree2727d0126d551e007881af6f8b0b63e8fa2afc5d
parente5c28d4f9a72691daa788a252f9b06c758882cf2
parentb0593a4bca138f1f026d8c21e8c3daa96800afe2
Merge commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2'

* commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2':
  hevc: pass the full HEVCNAL struct to decode_nal_unit

Conflicts:
libavcodec/hevc.c

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