[SCM] libav/experimental: hlsenc: Set the default codecs to AAC and H264

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 34e2ce5dde073244ccb2b62f930e96fe612690f7
Author: Martin Storsjö <martin at martin.st>
Date:   Thu May 15 21:43:46 2014 +0300

    hlsenc: Set the default codecs to AAC and H264
    
    Most HLS implementation only support these codecs.
    
    Signed-off-by: Martin Storsjö <martin at martin.st>

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index d36d3fb..aa38d05 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -342,8 +342,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,

-- 
Libav/FFmpeg packaging