3f760214b4
* commit '68b467742092364f9306283f40effde2c12efe08': lavf: Make probe_codec return an error code Conflicts: libavformat/utils.c A failure to reallocate should not free the array as it is used to probe the codec. And failure to reallocate if the following probe succeeds isnt a fatal error for probe_codec(). Thus this is only partially merged to ensure probing still is attempted with the data available. 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.