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)
* commit '34e2ce5dde073244ccb2b62f930e96fe612690f7':
  hlsenc: Set the default codecs to AAC and H264

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

Simple merge