Merge commit '27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 09:28:17 +0000 (11:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 09:28:28 +0000 (11:28 +0200)
commit0d5e615c10583af5f346f0bc7420ebc5077a5d47
tree673512e8fc02bf2233315b6a26352db6323f6f94
parent215430e049b78fc4c3d1cb8f6086bcd4bae0375e
parent27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3
Merge commit '27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3'

* commit '27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3':
  h264: drop needs_realloc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_picture.c
libavcodec/h264_slice.c