0a5d22a195
* commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e': h264_mp4toannexb_bsf: factor out extradata parsing Conflicts: libavcodec/h264_mp4toannexb_bsf.c 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.