Merge commit '5ac06633cb63fcc51f2471a3478b44d3f010b16b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 04:06:07 +0000 (05:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 04:06:23 +0000 (05:06 +0100)
commitd05b154b5b6d91ac625409542977a5c8a9a08a37
treec254b89450720b05e58c274c53a9027178e8d0f5
parent69234e29ad65d400752684640cc482278d423eb6
parent5ac06633cb63fcc51f2471a3478b44d3f010b16b
Merge commit '5ac06633cb63fcc51f2471a3478b44d3f010b16b'

* commit '5ac06633cb63fcc51f2471a3478b44d3f010b16b':
  takdec: check av_samples_get_buffer_size() return value

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