a4f8a56495
* commit '4736d003fac30af4afd8390182f12f480ad78801':
cavsdec: check ff_get_buffer() return value
Conflicts:
libavcodec/cavsdec.c
See: eee8c94f50
Merged-by: Michael Niedermayer <michaelni@gmx.at>
FFmpeg README ------------- 1) Documentation ---------------- * Read the documentation in the doc/ directory in git. You can also view it online at http://ffmpeg.org/documentation.html 2) Licensing ------------ * See the LICENSE file. 3) Build and Install -------------------- * See the INSTALL file.