Michael Niedermayer f67309cabe 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>

2012-06-03 02:56:52 +02:00

5.5 KiB

Raw Blame History

View Raw