Merge commit 'ae05b4865514fd71b5e9431e93aa0d03d7ba7751'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 12 Jul 2015 20:55:47 +0000 (22:55 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 12 Jul 2015 20:55:47 +0000 (22:55 +0200)
commit4c42c66935a7bdaded8667fa76dc0945ae66e867
tree34fe29a6bbbbd099f728a5c082f124fa8cf5d053
parent760304e4c3184d65cf90a017ea75ed40c3b823ea
parentae05b4865514fd71b5e9431e93aa0d03d7ba7751
Merge commit 'ae05b4865514fd71b5e9431e93aa0d03d7ba7751'

* commit 'ae05b4865514fd71b5e9431e93aa0d03d7ba7751':
  hevc: eliminate the second call to hls_nal_unit()

Conflicts:
libavcodec/hevc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/hevc.c
libavcodec/hevc.h