Merge commit '34e2ce5dde073244ccb2b62f930e96fe612690f7'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 17 May 2014 01:13:01 +0000 (03:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 17 May 2014 01:13:05 +0000 (03:13 +0200)
commitbe8f96e5eb3c79fdeb30933db49ca1e7e427f9bb
treec66207bdb68b258026535e131759f076930324c7
parente2760de60514b949c0a5584d797d933f711f5b14
parent34e2ce5dde073244ccb2b62f930e96fe612690f7
Merge commit '34e2ce5dde073244ccb2b62f930e96fe612690f7'

* commit '34e2ce5dde073244ccb2b62f930e96fe612690f7':
  hlsenc: Set the default codecs to AAC and H264

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/hlsenc.c