Merge commit '34e2ce5d'

* commit '34e2ce5d': hlsenc: Set the default codecs to AAC and H264 Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '34e2ce5d'
* commit '34e2ce5d': hlsenc: Set the default codecs to AAC and H264 Merged-by: Michael Niedermayer <michaelni@gmx.at>
be8f96e5 · Michael Niedermayer · e2760de6 · 34e2ce5d · be8f96e5
Commit be8f96e5 authored May 17, 2014 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

hlsenc.c libavformat/hlsenc.c +2 -2

No files found.
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -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,