Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Jun 2012 00:56:52 +0000 (02:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Jun 2012 00:56:52 +0000 (02:56 +0200)
commitf67309cabe27af33dcfcfb61fe1df39af9b5ab46
tree31bf4f48fbbbbdb145f8163f0295266c86ca173d
parenta128b310efa31ea0f2a3898cd58c0d954c8605be
parent2439bd86817374362ac8daa701fdb567e14cbe50
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>
configure
libavformat/Makefile
libavformat/adtsenc.c
libavformat/mpegtsenc.c