Merge commit 'ced7238cd01cc2199acf9225305628641a27c1d7'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Oct 2014 21:23:49 +0000 (23:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Oct 2014 21:23:53 +0000 (23:23 +0200)
commitf09162c06bbafc4801c5a63a5abc6ce37d8881bd
tree6a62668e59c92b5610a6d82c7879dc5d31d08b1b
parent60a876fe7b50935749200ae7f387e7f251b1a856
parentced7238cd01cc2199acf9225305628641a27c1d7
Merge commit 'ced7238cd01cc2199acf9225305628641a27c1d7'

* commit 'ced7238cd01cc2199acf9225305628641a27c1d7':
  rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpdec_hevc.c