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

pull/2/head
Anton Khirnov 13 years ago
parent b71389cbae
commit fb42d156ed
  1. 12
      libavformat/movenc.c
  2. 2
      tests/lavf-regression.sh

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

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

Loading…
Cancel
Save