diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-17 03:13:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-17 03:13:05 +0200 |
| commit | be8f96e5eb3c79fdeb30933db49ca1e7e427f9bb (patch) | |
| tree | c66207bdb68b258026535e131759f076930324c7 /libavformat/hlsenc.c | |
| parent | e2760de60514b949c0a5584d797d933f711f5b14 (diff) | |
| parent | 34e2ce5dde073244ccb2b62f930e96fe612690f7 (diff) | |
| download | ffmpeg-be8f96e5eb3c79fdeb30933db49ca1e7e427f9bb.tar.gz | |
Merge commit '34e2ce5dde073244ccb2b62f930e96fe612690f7'
* commit '34e2ce5dde073244ccb2b62f930e96fe612690f7':
hlsenc: Set the default codecs to AAC and H264
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hlsenc.c')
| -rw-r--r-- | libavformat/hlsenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 12bd07b2d4..86447d8151 100644 --- 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, |