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)
* commit '5ac06633cb63fcc51f2471a3478b44d3f010b16b':
  takdec: check av_samples_get_buffer_size() return value

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

Simple merge