har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

movenc: use libx264 by default when possible for mov, mp4 and psp

Browse Source
This commit is contained in:
Anton Khirnov 2011-08-20 16:14:58 +02:00
parent b71389cbae
commit fb42d156ed
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/movenc.c
View File

@ -2343,7 +2343,11 @@ AVOutputFormat ff_mov_muxer = {
.extensions = "mov", .extensions = "mov",
.priv_data_size = sizeof(MOVMuxContext), .priv_data_size = sizeof(MOVMuxContext),
.audio_codec = CODEC_ID_AAC, .audio_codec = CODEC_ID_AAC,
#if CONFIG_LIBX264_ENCODER
.video_codec = CODEC_ID_H264,
#else
.video_codec = CODEC_ID_MPEG4, .video_codec = CODEC_ID_MPEG4,
#endif
.write_header = mov_write_header, .write_header = mov_write_header,
.write_packet = ff_mov_write_packet, .write_packet = ff_mov_write_packet,
.write_trailer = mov_write_trailer, .write_trailer = mov_write_trailer,
@ -2376,7 +2380,11 @@ AVOutputFormat ff_mp4_muxer = {
.extensions = "mp4", .extensions = "mp4",
.priv_data_size = sizeof(MOVMuxContext), .priv_data_size = sizeof(MOVMuxContext),
.audio_codec = CODEC_ID_AAC, .audio_codec = CODEC_ID_AAC,
#if CONFIG_LIBX264_ENCODER
.video_codec = CODEC_ID_H264,
#else
.video_codec = CODEC_ID_MPEG4, .video_codec = CODEC_ID_MPEG4,
#endif
.write_header = mov_write_header, .write_header = mov_write_header,
.write_packet = ff_mov_write_packet, .write_packet = ff_mov_write_packet,
.write_trailer = mov_write_trailer, .write_trailer = mov_write_trailer,
@ -2392,7 +2400,11 @@ AVOutputFormat ff_psp_muxer = {
.extensions = "mp4,psp", .extensions = "mp4,psp",
.priv_data_size = sizeof(MOVMuxContext), .priv_data_size = sizeof(MOVMuxContext),
.audio_codec = CODEC_ID_AAC, .audio_codec = CODEC_ID_AAC,
#if CONFIG_LIBX264_ENCODER
.video_codec = CODEC_ID_H264,
#else
.video_codec = CODEC_ID_MPEG4, .video_codec = CODEC_ID_MPEG4,
#endif
.write_header = mov_write_header, .write_header = mov_write_header,
.write_packet = ff_mov_write_packet, .write_packet = ff_mov_write_packet,
.write_trailer = mov_write_trailer, .write_trailer = mov_write_trailer,

2
tests/lavf-regression.sh
View File

@ -87,7 +87,7 @@ do_lavf flv -an
fi fi
if [ -n "$do_mov" ] ; then if [ -n "$do_mov" ] ; then
do_lavf mov "-acodec pcm_alaw" do_lavf mov "-acodec pcm_alaw -c:v mpeg4"
fi fi
if [ -n "$do_dv_fmt" ] ; then if [ -n "$do_dv_fmt" ] ; then