Merge commit '11f024ef0ab923ed8680fc35a087d576e549c849'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 11:24:18 +0000 (13:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 11:26:33 +0000 (13:26 +0200)
commitd3a5dba81b3a0ab79df38751d31a6e7d8e251654
treea31d42cacab4ed5a6512ecb61e130c31c44e9eba
parentab7ad5e6a1b8359b169e7bcbe96ce7162d0c0002
parent11f024ef0ab923ed8680fc35a087d576e549c849
Merge commit '11f024ef0ab923ed8680fc35a087d576e549c849'

* commit '11f024ef0ab923ed8680fc35a087d576e549c849':
  h264: move freeing the escaped RBSP buffer to free_context()

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