mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-04 06:08:26 +02:00
f67309cabe
* qatar/master: mpegtsenc: Support LATM packetization for AAC adtsenc: Don't expose the muxer internals to the rest of lavf mpegtsenc: use AVFormatContext for AAC packetization mpegtsenc: use AVERROR() for return codes Conflicts: libavformat/adts.h libavformat/mpegtsenc.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.