Commit be8f96e5 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '34e2ce5d'

* commit '34e2ce5d':
  hlsenc: Set the default codecs to AAC and H264
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents e2760de6 34e2ce5d
......@@ -348,8 +348,8 @@ AVOutputFormat ff_hls_muxer = {
.long_name = NULL_IF_CONFIG_SMALL("Apple HTTP Live Streaming"),
.extensions = "m3u8",
.priv_data_size = sizeof(HLSContext),
.audio_codec = AV_CODEC_ID_MP2,
.video_codec = AV_CODEC_ID_MPEG2VIDEO,
.audio_codec = AV_CODEC_ID_AAC,
.video_codec = AV_CODEC_ID_H264,
.flags = AVFMT_NOFILE | AVFMT_ALLOW_FLUSH,
.write_header = hls_write_header,
.write_packet = hls_write_packet,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment