[FFmpeg-cvslog] movenc: use libx264 by default when possible for mov, mp4 and psp

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Aug 20 16:14:58 2011 +0200| [fb42d156ed3a726f9a6c76025ea9e1237e6b4840] | committer: Anton Khirnov

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb42d156ed3a726f9a6c76025ea9e1237e6b4840
---

 libavformat/movenc.c     |   12 ++++++++++++
 tests/lavf-regression.sh |    2 +-
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 0395910..5ac95b8 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -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,
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index 8ed9277..1d7f640 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -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