Merge remote-tracking branch 'qatar/master'
* 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>
Showing
libavformat/adts.h
deleted
100644 → 0
This diff is collapsed.
Please
register
or
sign in
to comment